Given the fact that I don't have the reproduction environment any more, and that no other users seem to have complained about it (*), I'd accept my patches being removed, but not without grinding my teeth. I'd prefer a clean solution. (*) The problem manifests itself by the catch-all error message "error: Unable to communicate with device (code=12)". Users affected by this message might simply not realize that this is caused by the rather subtle mDNS problem.