diff --git a/core/core.services.yml b/core/core.services.yml
index 7d9e831..515091f 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -222,9 +222,6 @@ services:
   lock:
     class: Drupal\Core\Lock\DatabaseLockBackend
     arguments: ['@database']
-  user.tempstore:
-    class: Drupal\user\TempStoreFactory
-    arguments: ['@database', '@lock']
   router.request_context:
     class: Symfony\Component\Routing\RequestContext
     calls:
@@ -519,13 +516,6 @@ services:
     class: Drupal\Core\Ajax\AjaxSubscriber
     tags:
       - { name: event_subscriber }
-  image.toolkit.manager:
-    class: Drupal\system\Plugin\ImageToolkitManager
-    arguments: ['@container.namespaces', '@cache.cache', '@language_manager']
-  image.toolkit:
-    class: Drupal\system\Plugin\ImageToolkitInterface
-    factory_method: getDefaultToolkit
-    factory_service: image.toolkit.manager
   image.factory:
     class: Drupal\Core\Image\ImageFactory
     arguments: ['@image.toolkit']
diff --git a/core/modules/system/system.services.yml b/core/modules/system/system.services.yml
index ae137da..081a2f4 100644
--- a/core/modules/system/system.services.yml
+++ b/core/modules/system/system.services.yml
@@ -23,3 +23,10 @@ services:
     class: Drupal\system\Routing\RouteSubscriber
     tags:
       - { name: event_subscriber }
+  image.toolkit.manager:
+    class: Drupal\system\Plugin\ImageToolkitManager
+    arguments: ['@container.namespaces', '@cache.cache', '@language_manager']
+  image.toolkit:
+    class: Drupal\system\Plugin\ImageToolkitInterface
+    factory_method: getDefaultToolkit
+    factory_service: image.toolkit.manager
diff --git a/core/modules/user/user.services.yml b/core/modules/user/user.services.yml
index 6fb7d47..39e48de 100644
--- a/core/modules/user/user.services.yml
+++ b/core/modules/user/user.services.yml
@@ -25,3 +25,6 @@ services:
     class: Drupal\user\EventSubscriber\MaintenanceModeSubscriber
     tags:
       - { name: event_subscriber }
+  user.tempstore:
+    class: Drupal\user\TempStoreFactory
+    arguments: ['@database', '@lock']