Comment 3 for bug 1894619

I think either of the patches is probably fine, no idea what any upstream reviewer will prefer.

I guess it would be good to upload one of them sooner rather than later though, to (1) unbreak dnsmasq, (2) unblock network-manager.