This reverts commit 25fd366d6a. Reason: buildbot breakage (https://lab.llvm.org/buildbot/#/builders/186/builds/3642)
25fd366d6a