Revert to Team-Hydra Kernel