This reverts commit e80748ff8840a10bd7c7336eb5e98664480ba1ba. This was causing a test failure on a buildbot: https://lab.llvm.org/buildbot/#/builders/139/builds/22964
This reverts commit e80748ff8840a10bd7c7336eb5e98664480ba1ba. This was causing a test failure on a buildbot: https://lab.llvm.org/buildbot/#/builders/139/builds/22964