Revert "Fix the mac build."

This reverts commit 560eaab489316778f491132c7b05a647b098d2a0.
10 files changed