Revert "Hybrid preparation (7/x)"

This reverts commit 47ebd0a8aabe5103ea366742cb0b831db9b58396.
Revert "Hybrid preparation (6/x)"

This reverts commit 86c76e791e43cbd0ceee9e2125ea369cca4cffb6.