Revert r190366. It was breaking build bots.