Revert MR62665 as is not clear it helper or made things worse
Revert MR62665 as is not clear it helper or made things worse
ping @jchapman
We did see improvement due to other 2 changes. But there seems to be a possible regression due to the one reverted here