Make sure the fix for T126307 doesn't have any noticeable negative impacts.
Done for now. May have to do more analysis later after further tweaks.