IMHO this should be squashed with the previous patch, to keep it "atomic", easing reverts or cherry-picks during backports.