diff --git a/core/lib/Drupal/Core/Controller/ControllerResolver.php b/core/lib/Drupal/Core/Controller/ControllerResolver.php
index eaa1623..d040da1 100644
--- a/core/lib/Drupal/Core/Controller/ControllerResolver.php
+++ b/core/lib/Drupal/Core/Controller/ControllerResolver.php
@@ -130,7 +130,7 @@ protected function createController($controller) {
       throw new \LogicException(sprintf('Unable to parse the controller name "%s".', $controller));
     }
 
-    if ($controller instanceof ContainerAwareInterface) {
+    if (method_exists($controller,'setContainer')) {
       $controller->setContainer($this->container);
     }