Revert r66920. It was causing failures in the self-hosting buildbot (in release