Revert 57ee5c5..1147643

This rolls back to commit 57ee5c554577b8dc897dfcb25a92f888906e9621.
fixed gw param in envaya