This reverts commit bda6e5bee0. See https://lab.llvm.org/buildbot/#/builders/109/builds/15424 for instance
bda6e5bee0