This reverts commit e91fe08999. Breaks following buildbots: https://lab.llvm.org/buildbot/#/builders/171
e91fe08999