Revert r119551, which broke buildbots.