revert r251349; it included code for a functional change