Merge "Revert "Probably fix the Mac build.""