revert r100842 which broke several of the build bots.