revert r12489.