Revert 51758 because it broke all the buildbots
3 files changed