Re-apply r111568 with a fix for the clang self-host.