Switch to are own kernel

Change-Id: If8b29afda6787869ab6b12a68d20d9114edf3bf7