Revert r351208 (which was a revert of r350892).

This corresponds to the fix to Clang in r351470.

llvm-svn: 351471
GitOrigin-RevId: b95b6f42f9cf6c588380b12a9cc02af5adc9eacc
3 files changed