This reverts commit ef9e6246 for further investigation offline. It appears to break the buildbot llvm-clang-x86_64-sie-ubuntu-fast.