This reverts commit 27ecb63c26. Still fails compiler-rt: https://lab.llvm.org/buildbot/#/builders/109/builds/75364
27ecb63c26