diff --git a/app/build.gradle b/app/build.gradle
index 487c6e548..837795ee7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -364,7 +364,6 @@ dependencies {
     implementation Deps.androidx_recyclerview
     implementation Deps.androidx_lifecycle_runtime
     implementation Deps.androidx_lifecycle_viewmodel
-    implementation Deps.androidx_lifecycle_viewmodel_ss
     implementation Deps.androidx_core
     implementation Deps.androidx_core_ktx
     implementation Deps.androidx_transition
diff --git a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
index 2bae219ff..2c2b701a3 100644
--- a/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
+++ b/app/src/main/java/org/mozilla/fenix/browser/BaseBrowserFragment.kt
@@ -16,6 +16,7 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import androidx.navigation.fragment.findNavController
 import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -101,7 +102,9 @@ abstract class BaseBrowserFragment : Fragment(), BackHandler, SessionManager.Obs
     private var browserInitialized: Boolean = false
     private var initUIJob: Job? = null
 
-    val viewModel: CreateCollectionViewModel by activityViewModels()
+    val viewModel: CreateCollectionViewModel by activityViewModels {
+        ViewModelProvider.NewInstanceFactory() // this is a workaround for #4652
+    }
 
     @CallSuper
     override fun onCreateView(
diff --git a/architecture/build.gradle b/architecture/build.gradle
index fddb46a5d..ecdbf86f5 100644
--- a/architecture/build.gradle
+++ b/architecture/build.gradle
@@ -33,7 +33,6 @@ dependencies {
 
     implementation Deps.androidx_annotation
     implementation Deps.androidx_lifecycle_extensions
-    implementation Deps.androidx_lifecycle_viewmodel_ss
     implementation Deps.mozilla_support_base
 
     implementation Deps.rxAndroid
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
index f2f10c01a..280d66ee6 100644
--- a/buildSrc/src/main/java/Dependencies.kt
+++ b/buildSrc/src/main/java/Dependencies.kt
@@ -26,7 +26,6 @@ object Versions {
     const val androidx_fragment = "1.2.0-alpha02"
     const val androidx_navigation = "2.2.0-alpha01"
     const val androidx_recyclerview = "1.1.0-beta01"
-    const val androidx_lifecycle_savedstate = "1.0.0-alpha01"
     const val androidx_testing = "1.2.1-alpha02"
     const val androidx_test_ext = "1.0.0"
     const val androidx_core = "1.2.0-alpha03"
@@ -165,7 +164,6 @@ object Deps {
     const val androidx_lifecycle_extensions = "androidx.lifecycle:lifecycle-extensions:${Versions.androidx_lifecycle}"
     const val androidx_lifecycle_viewmodel = "androidx.lifecycle:lifecycle-viewmodel-ktx:${Versions.androidx_lifecycle}"
     const val androidx_lifecycle_runtime = "androidx.lifecycle:lifecycle-runtime-ktx:${Versions.androidx_lifecycle}"
-    const val androidx_lifecycle_viewmodel_ss = "androidx.lifecycle:lifecycle-viewmodel-savedstate:${Versions.androidx_lifecycle_savedstate}"
     const val androidx_paging = "androidx.paging:paging-runtime-ktx:${Versions.androidx_paging}"
     const val androidx_preference = "androidx.preference:preference-ktx:${Versions.androidx_preference}"
     const val androidx_safeargs = "androidx.navigation:navigation-safe-args-gradle-plugin:${Versions.androidx_navigation}"