Revert "Add a switch to hybrid settings"

This reverts commit 8c089465808eb563f1b1852a9ccd38af2107eade.