Follow our own Gee kernel

Change-Id: I07476ae10be95b7245ac0b74701d572770a628a8