This reverts commit 070f84ebc8. Buildbot failure: https://lab.llvm.org/buildbot/#/builders/51/builds/10694
070f84ebc8