reverted gateway changes