Comment 20 for bug 1833229

pip right through to Ubuntu development appears to be missing part of the fix for this problem so I've picked fixes for bionic/eoan/focal into:

  https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3690

I'm still not able to reproduce this issue but please test and see if the proposed version resolves this issue with the test case in #16.