Revert 186302 to fix build bots.