Revert "Hybrid preparation (14/x)"

This reverts commit 3682003c12a38d1be52f3882317d3e7ec2764323.