Revert "Hybrid preparation (4/x)"

This reverts commit b4bbae8e0ebba2a7bd1f8bd44c032bc92b47ff20.