Reverting r138695 to see if it fixes clang self host.