moved to diablo kernel