Revert r223049, r223050 and r223051 while investigating test failures.

I didn't foresee affecting the Clang test suite :/