Revert "jf: Updates for new kernel"

This reverts commit 8307fbf959cf941d4a869389c17f43f6b09b07c7.