Revert "Initial fork from my zeus mainkernel for this one"

This reverts commit 27211842e31d8796dbb851af9280cc57f05f3691.