The patch is breaking the expected behaviour so far. I see benefits on matching based on remote address, but existing one has to be preserved as well.
One solution would be to add a new attribute in the section to specify the address to match, like:
``` match=local # or match=remote ```
This can also be added for the server sections.