Revert "Hybrid preparation (17/x)"

This reverts commit 7ed1e3c4023d293e45e6431accf6b2d1dc74408f.