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