This reverts commit 1a54671d. It was causing lit test failures in a LLVM_ENABLE_EXPENSIVE_CHECKS build.