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