                 .tabTrayGroups:
             return checkGroupingFeature(for: featureID, from: nimbus)
 
-        case .onboardingUpgrade,
-                .onboardingFreshInstall:
-            return checkNimbusForOnboardingFeature(for: featureID, from: nimbus)
+//        case .onboardingUpgrade,
+//                .onboardingFreshInstall:
+//            return checkNimbusForOnboardingFeature(for: featureID, from: nimbus)
 
         case .sponsoredTiles:
             return checkSponsoredTilesFeature(from: nimbus)

        case .disabled: return .disabled
        case .afterFourHours: return .afterFourHours
        case .always: return .always
        }
    }


                .wallpaperVersion:
            return checkNimbusForWallpapersFeature(using: nimbus)

//        case .wallpaperOnboardingSheet:
//            return checkNimbusForWallpaperOnboarding(using: nimbus)

        // MARK: - Temp Nimbus Redirect for MR22
        // This section overrides the other sections specifically for the MR22 experiment.
        // TODO: Remove this section & corresponding function after experiment conculdes.
        // https://mozilla-hub.atlassian.net/browse/FXIOS-4875
        case .wallpaperOnboardingSheet,
                .onboardingFreshInstall,
                .onboardingUpgrade,
                .contextualHintForJumpBackInSyncedTab,
                .copyForJumpBackIn,
                .copyForToolbar:
            return checkNimbusForMR22Feature(for: featureID, using: nimbus)
        }
    }

