Ludovic Courtès <ludo@gnu.org> skribis:

> I tried backporting it (patch below) but that leads to:

And here’s the patch.