Tested and confirmed on Focal server to fix my issue.
I don't currently have a misbehaving Jammy server to test on but I have no reason to believe that this fix wouldn't work the same way on Jammy, since I was using a local copy from the ubuntu/devel tree earlier this week on a broken Jammy system (which has since been fixed, so I can't re-test...)
Tested and confirmed on Focal server to fix my issue.
I don't currently have a misbehaving Jammy server to test on but I have no reason to believe that this fix wouldn't work the same way on Jammy, since I was using a local copy from the ubuntu/devel tree earlier this week on a broken Jammy system (which has since been fixed, so I can't re-test...)