Comment 2 for bug 1962785

Ah, thanks Frank - and I see the follow-up fix 7cf95304f8e9 as well. Since 22.04 is nearing release, I think I'll upload the bare minimum 0de9020c970b, as it is sufficient to fix the problem we're seeing. Once 22.10 opens up for devel let's reconsider applying the others (or go back to syncing with Debian if they've addressed it by then).