diff --git a/core/lib/Drupal/Core/Entity/EntityResolverManager.php b/core/lib/Drupal/Core/Entity/EntityResolverManager.php
index b7e37d3dffba..da05970c805c 100644
--- a/core/lib/Drupal/Core/Entity/EntityResolverManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityResolverManager.php
@@ -136,8 +136,7 @@ class EntityResolverManager {
   /**
    * Sets the upcasting information using the _entity_* route defaults.
    *
-   * Supported are the '_entity_view', '_entity_list' and '_entity_form' route
-   * defaults.
+   * Supports the '_entity_view' and '_entity_form' route defaults.
    *
    * @param \Symfony\Component\Routing\Route $route
    *   The route object.
@@ -146,9 +145,6 @@ class EntityResolverManager {
     if ($entity_view = $route->getDefault('_entity_view')) {
       list($entity_type) = explode('.', $entity_view, 2);
     }
-    elseif ($entity_list = $route->getDefault('_entity_list')) {
-      $entity_type = $entity_list;
-    }
     elseif ($entity_form = $route->getDefault('_entity_form')) {
       list($entity_type) = explode('.', $entity_form, 2);
     }
@@ -194,7 +190,7 @@ class EntityResolverManager {
       }
     }
 
-    // Try to use _entity_view, _entity_list information on the route.
+    // Try to use _entity_* information on the route.
     $this->setParametersFromEntityInformation($route);
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
index 4df611c92e21..add0e230af1f 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityResolverManagerTest.php
@@ -327,7 +327,7 @@ class EntityResolverManagerTest extends UnitTestCase {
     $this->entityResolverManager->setRouteOptions($route);
     $this->assertEquals($defaults, $route->getDefaults());
     $parameters = $route->getOption('parameters');
-    $this->assertEquals(array('entity_test' => array('type' => 'entity:entity_test')), $parameters);
+    $this->assertNull($parameters);
   }
 
   /**