Comment 13 for bug 1859685

It is an ugly, but effective workaround to get back to the status-quo it had before.
After the input by Till that this is about to die anyway it seems even more reasonable to give it that quick-shot to be working for the time being.

You have upstreamed it (if they want to consider it at all), the patch and headers look good, the argument and documentation of choice is good and the changelog looks ok.

+1 on the fix as attached here.