diff --git a/core/includes/install.core.inc b/core/includes/install.core.inc
index 36b6b14..e0fa799 100644
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -453,10 +453,8 @@ function install_begin_request(&$install_state) {
     $settings['keyvalue_default'] = 'keyvalue.memory';
     new Settings($settings);
 
-    $container->register('state', 'Drupal\Core\KeyValueStore\KeyValueStoreInterface')
-      ->setFactoryService(new Reference('keyvalue'))
-      ->setFactoryMethod('get')
-      ->addArgument('state');
+    $container->register('state', 'Drupal\Core\KeyValueStore\State')
+      ->addArgument(new Reference('keyvalue'));
 
     // Register Twig template engine for use during install.
     CoreServiceProvider::registerTwig($container);
diff --git a/core/lib/Drupal/Core/KeyValueStore/State.php b/core/lib/Drupal/Core/KeyValueStore/State.php
index 57b96dc..f255e51 100644
--- a/core/lib/Drupal/Core/KeyValueStore/State.php
+++ b/core/lib/Drupal/Core/KeyValueStore/State.php
@@ -29,11 +29,11 @@ class State implements StateInterface {
   /**
    * Constructs a State object.
    *
-   * @param \Drupal\Core\KeyValueStore\KeyValueStoreInterface $keyValueStore
+   * @param \Drupal\Core\KeyValueStore\KeyValueFactory $key_value_factory
    *  The key value store to use.
    */
-  function __construct(KeyValueFactory $keyValueFactory) {
-    $this->keyValueStore = $keyValueFactory->get('state');
+  function __construct(KeyValueFactory $key_value_factory) {
+    $this->keyValueStore = $key_value_factory->get('state');
   }
 
   /**