Revert most tuna changes, leave kernel for now, will be revisited

Change-Id: I59050b88ee0519061f372d40b3ef243914c095e7