Revert "Revert kernel changes"

This reverts commit 152837de5bce34ba136093c54fd991b98806919d.