diff -u /dev/null b/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
--- /dev/null
+++ b/core/lib/Drupal/Core/Entity/Controller/EntityListController.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\Core\Entity\Controller\EntityListController.
+ */
+
+namespace Drupal\Core\Entity\Controller;
+
+use Drupal\Core\ControllerInterface;
+use Drupal\Core\Entity\EntityManager;
+use Symfony\Component\DependencyInjection\ContainerInterface;
+
+/**
+ * Defines a generic controller to list entities.
+ */
+class EntityListController implements ControllerInterface {
+
+  /**
+   * The entity manager
+   *
+   * @var \Drupal\Core\Entity\EntityManager
+   */
+  protected $entityManager;
+
+  /**
+   * Creates an EntityListController object.
+   *
+   * @param \Drupal\Core\Entity\EntityManager $entity_manager
+   *   The entity manager.
+   */
+  public function __construct(EntityManager $entity_manager) {
+    $this->entityManager = $entity_manager;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public static function create(ContainerInterface $container) {
+    return new static(
+      $container->get('plugin.manager.entity')
+    );
+  }
+
+  /**
+   * Provides the listing page for any entity type.
+   *
+   * @param string $entity_type
+   *   The entity type to render.
+   *
+   * @return array
+   *   A render array as expected by drupal_render().
+   */
+  public function listing($entity_type) {
+    return $this->entityManager->getListController($entity_type)->render();
+  }
+
+}
+
diff -u b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
--- b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
+++ b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
@@ -42,7 +42,7 @@
         $defaults['_controller'] = '\Drupal\Core\Entity\HtmlEntityFormController::content';
       }
       elseif (!empty($defaults['_entity_list'])) {
-        $defaults['_controller'] = '\Drupal\Core\Entity\HtmlEntityListController::content';
+        $defaults['_content'] = '\Drupal\Core\Entity\Controller\EntityListController::listing';
       }
     }
     return $defaults;
reverted:
--- b/core/lib/Drupal/Core/Entity/HtmlEntityListController.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * @file
- * Contains \Drupal\Core\Entity\HtmlEntityListController.
- */
-
-namespace Drupal\Core\Entity;
-
-use Symfony\Component\DependencyInjection\ContainerAwareInterface;
-use Symfony\Component\DependencyInjection\ContainerInterface;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-
-/**
- * Wrapping controller for entity lists that serve as the main page body.
- */
-class HtmlEntityListController implements ContainerAwareInterface {
-
-  /**
-   * The injection container for this object.
-   *
-   * @var \Symfony\Component\DependencyInjection\ContainerInterface
-   */
-  protected $container;
-
-  /**
-   * Injects the service container used by this object.
-   *
-   * @param \Symfony\Component\DependencyInjection\ContainerInterface $container
-   *   The service container this object should use.
-   */
-  public function setContainer(ContainerInterface $container = NULL) {
-    $this->container = $container;
-  }
-
-  public function content(Request $request, $_entity_list) {
-    $content = $this->container->get('plugin.manager.entity')->getListController($_entity_list)->render();
-    return new Response(drupal_render_page($content));
-  }
-
-}