Revert VTGate protocol independent change