Revert everything to one single kernel