This reverts commit 82c820b9. This failed llvm-testsuite in our downstream and a similar issue was reported by @rogfer01.