This reverts commit 396e944d82. Failing bot: https://lab.llvm.org/buildbot/#/builders/89/builds/30096
396e944d82