diff --git a/config-templates/config.php b/config-templates/config.php
index f358b1bb9cc4283a5eae61f47bf507b2dfc6cd69..7921d6daed4b46dc0862d0575c6afb17f8e49b67 100644
--- a/config-templates/config.php
+++ b/config-templates/config.php
@@ -1054,8 +1054,6 @@ $config = array(
      * - 'redis': Key-value datastore, based on redis.
      *
      * The default datastore is 'phpsession'.
-     *
-     * (This option replaces the old 'session.handler'-option.)
      */
     'store.type'                    => 'phpsession',
 
diff --git a/docs/simplesamlphp-artifact-idp.md b/docs/simplesamlphp-artifact-idp.md
index 4db281c494f8559efe058dfda9560b4cf6fb2aab..b07985a854b40c7c43f40351b702ac3aee88976e 100644
--- a/docs/simplesamlphp-artifact-idp.md
+++ b/docs/simplesamlphp-artifact-idp.md
@@ -26,7 +26,7 @@ The default configuration on Debian is for the memcache server to be accessible
 
 
 Once the memcache server is configured, you can configure simplesamlphp to use it to store sessions.
-You can do this by setting the `session.handler` option in `config.php` to `memcache`.
+You can do this by setting the `store.type` option in `config.php` to `memcache`.
 If you are running memcache on a different server than the IdP, you must also change the `memcache_store.servers` option in `config.php`.
 
 
diff --git a/lib/SimpleSAML/SessionHandler.php b/lib/SimpleSAML/SessionHandler.php
index 945a75d6ac032e5cbee24b97ef52413904cd61a8..25f4ab580a4b67f53b49f3f5ef4b43c4e2ca62ed 100644
--- a/lib/SimpleSAML/SessionHandler.php
+++ b/lib/SimpleSAML/SessionHandler.php
@@ -123,7 +123,7 @@ abstract class SessionHandler
      * Initialize the session handler.
      *
      * This function creates an instance of the session handler which is
-     * selected in the 'session.handler' configuration directive. If no
+     * selected in the 'store.type' configuration directive. If no
      * session handler is selected, then we will fall back to the default
      * PHP session handler.
      */
diff --git a/lib/SimpleSAML/Store.php b/lib/SimpleSAML/Store.php
index 3beb66eba1b0ea8e774adc133e1f864c05098fd2..1d2b0691ff4c6e484dbaf633469fa53fa3904023 100644
--- a/lib/SimpleSAML/Store.php
+++ b/lib/SimpleSAML/Store.php
@@ -36,9 +36,6 @@ abstract class Store
 
         $config = Configuration::getInstance();
         $storeType = $config->getString('store.type', null);
-        if ($storeType === null) {
-            $storeType = $config->getString('session.handler', 'phpsession');
-        }
 
         switch ($storeType) {
             case 'phpsession':