moar g3

Change-Id: I45f4ca1f3d89b5b5dd4fe811da69070d9d2d5249