Revert r16860