Revert r186907 to fix bots.