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