Revert r136156, which broke several buildbots.