Speculatively revert r108429 to fix the clang self-host.