This reverts commit 84ed3a79. A number of clang tests are also affected by this change. Revert until I can update them.