Revert r218380. This was breaking Apple internal build bots.