Revert "Hate is a strong word... but I HATE the G2. HATE HATE HATE HATE"

fixes build

This reverts commit dcacfcc5ddc2fa2aab2ca9799d5a170c2a97922a.

Change-Id: I989852bec5be934530648ec2e438dd9db83b0c05