Merge "Revert "Revert "Fix the mac build."""