diff --git a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
index 1a5bcc7..612512f 100644
--- a/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
+++ b/core/lib/Drupal/Core/Entity/Enhancer/EntityRouteEnhancer.php
@@ -7,10 +7,6 @@
 
 namespace Drupal\Core\Entity\Enhancer;
 
-use Drupal\Core\Controller\ControllerResolverInterface;
-use Drupal\Core\Entity\EntityManagerInterface;
-use Drupal\Core\Entity\HtmlEntityFormController;
-use Drupal\Core\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Cmf\Component\Routing\Enhancer\RouteEnhancerInterface;
 use Symfony\Cmf\Component\Routing\RouteObjectInterface;
diff --git a/core/lib/Drupal/Core/EventSubscriber/ContentControllerSubscriber.php b/core/lib/Drupal/Core/EventSubscriber/ContentControllerSubscriber.php
index 90fe65d..73b17c1 100644
--- a/core/lib/Drupal/Core/EventSubscriber/ContentControllerSubscriber.php
+++ b/core/lib/Drupal/Core/EventSubscriber/ContentControllerSubscriber.php
@@ -87,7 +87,7 @@ public function onRequestDeriveFormWrapper(GetResponseEvent $event) {
     $request = $event->getRequest();
 
     if ($form = $request->attributes->get('_form')) {
-      $defaults['_content'] = 'controller.form:getContentResult';
+      $request->attributes->set('_content', 'controller.form:getContentResult');
     }
   }