Revert "Fixing Default GW"

This reverts commit 2e12c3f3f0c99fc6208e75e9f111945d4edc744c.