Revert "Hybrid preparation (5/x)"

This reverts commit 52ae6cd16010d479c34a65a9cbd1a79b469039a0.