revert r96241. It breaks two regression tests, isn't documented,