Revert r188574.  Turns out it isn't needed.