Fix bug #1167328 gateway always set

pass through gateway conditional; comment out if not needed, leave uncommented and define if needed