Revert "[FEATURE] Fallback/default case for SwitchViewhelper"