Revert r107205 and r107207.

llvm-svn: 107215
GitOrigin-RevId: 363217175037e53c8e0844bf596bdb0b32a372e3
26 files changed