Revert "Merged Hybrid Mode"

This reverts commit 0ff5793372b5a2797bd03412ce53b463797735d3.