diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
index aa168d2..08e673e 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseExpirableFactory.php
@@ -6,24 +6,15 @@
  */
 
 namespace Drupal\Core\KeyValueStore;
+
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Database\Database;
+use Drupal\Core\KeyValueStore\KeyValueDatabaseFactory;
 
 /**
  * Defines the key/value store factory for the database backend.
  */
-class KeyValueDatabaseExpirableFactory {
-
-  /**
-   * Constructs this factory object.
-   *
-   *
-   * @param \Drupal\Core\Database\Connection $connection
-   *   The Connection object containing the key-value tables.
-   */
-  function __construct(Connection $connection) {
-    $this->connection = $connection;
-  }
+class KeyValueDatabaseExpirableFactory extends KeyValueDatabaseFactory {
 
   /**
    * Constructs a new key/value expirable database storage object for a given
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
index 50f76e1..ded528e 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueDatabaseFactory.php
@@ -20,12 +20,9 @@ class KeyValueDatabaseFactory {
    *
    * @param \Drupal\Core\Database\Connection $connection
    *   The Connection object containing the key-value tables.
-   * @TODO: remove the NULL case once http://drupal.org/node/1811730 is in.
    */
-  function __construct(Connection $connection = NULL) {
-    // @TODO: remove the ?: Database::getConnection() once
-    // http://drupal.org/node/1811730 is in.
-    $this->connection = $connection ?: Database::getConnection();
+  function __construct(Connection $connection) {
+    $this->connection = $connection;
   }
 
   /**