Temp renabling the 3.0 gateways