Comment 3 for bug 1690654

Care to try wip/ubuntu-3-24 or wip/ubuntu-master upstream? I noticed this was broken too and poked into it. I found a few things that I thought were problems and tried to fix them. I was able to do an upgrade using the 3-24 branch built using of jhbuild.

It's the commit on top. If it works for you and you want to upload, feel free to squash / force push / upload. If it doesn't, feel free to investigate some more and fix. :)