Revert "Changes for Cody Kernel V4"

This reverts commit 380d10e2a2a12639f1bb91215b6501b42c3acda5.