Revert "Initial changes for new kernel"

This reverts commit 420d398be966fd6afe3a50a170076595d1fd2cdf