Revert r146184. I am seeing performance regression cause by this patch in one test...