This reverts commit 4b3cd379cc since it
introduces some test failures:
https://lab.llvm.org/buildbot/#/builders/68/builds/62556
This reverts commit 4b3cd379cc since it
introduces some test failures:
https://lab.llvm.org/buildbot/#/builders/68/builds/62556