Revert r107205 and r107207.