Revert r33661, which broke all buildbots.
4 files changed