Add a check to prevent this gateway code from triggering the address family check. This might not be all that is needed for Ticket #1949
Add a check to prevent this gateway code from triggering the address family check. This might not be all that is needed for Ticket #1949