This reverts commit 8a959625. Reported failures with LLVM_ENABLE_EXPENSIVE_CHECKS, need to investigate.