Windows CI is failing following the fix for #17796 but only on 2.2.x. I suspect this may be a result of the new fix clashing with the older fix for #17127