Another attempt to fix build.