Back out r173689. It doesn't matter when we're building with Clang anyway.