Revert "Merge branch 'jc/patch-id' into maint-2.46"