revert r34818 -- bad