Revert r98089, it was breaking a clang test.