Put a bandaid on G2, when what it really needs is a BRAIN TRANSPLANT

Change-Id: Ibb98570119cb923aaad23767099c0e6717f2a237