This reverts commit fe364e5dc78c58a915986d9a44cfd65f919a00c2. Causes breakages, e.g. https://lab.llvm.org/buildbot/#/builders/188/builds/5266
This reverts commit fe364e5dc78c58a915986d9a44cfd65f919a00c2. Causes breakages, e.g. https://lab.llvm.org/buildbot/#/builders/188/builds/5266