This reverts commit c88928805f. Reason for the revert: breaks the post-submit Mac iOS build bot.
c88928805f