Merge "Revert "Fix the mac build.""