Revert "g2: tweaks"

This would make vs980 and ls980 not break... there are ways to do this at runtime. Take a gander at jflte's init and the associated nuclearwinter script in vendor/vanir.

This reverts commit e43d9abe2b204d6a4cac6f9966769f9d921bf46a.

Change-Id: I4dd2d4a85eba6c6c3a8b3d68cc04224a59429f7d
Merge "Revert "g2: tweaks"" into kk44