Revert r44801 "Tweaks from profiling"