Revert r97917, which was causing Clang Debug self-host failures.