This reverts commit 2325e011. Reverted due to buildbot failure: llvm-clang-x86_64-expensive-checks-debian