Revert "N00b fix :)"

This reverts commit aab2e1e6a35d07b49131d646b89f3f9570b94fad.
Revert "[WIP] Hybrid 3.0"

This reverts commit e37e7cceda82523538990c57c9eae4d6d213bf6c.