Temporarily revert r75408. It appears to break the Apple-style builds: