Follow our own golden kernel

Change-Id: Ie0dcf3394cbcea3dab3c7061ced432fd330e5e7c