Follow our own Gee-common

Small chance I will get this working before I lose interest in fixing this legacy device

Change-Id: If704159b5e11780f1ed2874a2326b44810ef7884