G2 for real

Change-Id: Ib998813613a6603f0b836628a6da81d777bba398