Revert r208025, which made buildbots unhappy for unknown reasons.