Revert "Changes to support Sultan kernel." Second push by mistake...

This reverts commit a812edf81a8dd2b67dd432aab75e415ebc582bfd.