Revert "[WIP] Hybrid 3.0"

This reverts commit 4be19cad1b11d13aa7e623bfaa16a46c40f99f14.