Revert "Switch for hybrid settings"

This reverts commit 6329b1f62602205401256923544e50b28563359f.