Revert "g2: Temp fix for DT2W"

Change-Id: Id4c9e826ba95fe8d190b5d1fbff31194ccee72a1