Cherry pick some more tweaks to reduce the change further.