Revert "Switch to team omni kernel"

This reverts commit 2769cc206e5af4531bee2a40c63f253b55264ef6.