diff --git a/core/core.services.yml b/core/core.services.yml
index 53a2725..7793bc8 100644
--- a/core/core.services.yml
+++ b/core/core.services.yml
@@ -779,8 +779,7 @@ services:
       - { name: route_filter }
   paramconverter_manager:
     class: Drupal\Core\ParamConverter\ParamConverterManager
-    tags:
-      - { name: service_collector, tag: paramconverter, call: addConverter }
+    parent: container.trait
   paramconverter_subscriber:
     class: Drupal\Core\EventSubscriber\ParamConverterSubscriber
     tags:
diff --git a/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php b/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
index 8719cd9..f527c17 100644
--- a/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
+++ b/core/lib/Drupal/Core/ParamConverter/ParamConverterManager.php
@@ -18,7 +18,10 @@
  * A typical use case for this would be upcasting (converting) a node id to a
  * node entity.
  */
-class ParamConverterManager implements ParamConverterManagerInterface {
+class ParamConverterManager implements ParamConverterManagerInterface, ContainerAwareInterface {
+
+  use ContainerAwareTrait;
+
 
   /**
    * Array of loaded converter services keyed by their ids.
@@ -30,18 +33,13 @@ class ParamConverterManager implements ParamConverterManagerInterface {
   /**
    * {@inheritdoc}
    */
-  public function addConverter(ParamConverterInterface $param_converter, $id) {
-    $this->converters[$id] = $param_converter;
-    return $this;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
   public function getConverter($converter) {
     if (isset($this->converters[$converter])) {
       return $this->converters[$converter];
     }
+    elseif ($converter = $this->container->get($converter)) {
+      return $this->converters[$converter] - $converter;
+    }
     else {
       throw new \InvalidArgumentException(sprintf('No converter has been registered for %s', $converter));
     }
diff --git a/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php b/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php
index 77f69c5..d3668c8 100644
--- a/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php
+++ b/core/lib/Drupal/Core/ParamConverter/ParamConverterManagerInterface.php
@@ -15,18 +15,6 @@
 interface ParamConverterManagerInterface {
 
   /**
-   * Registers a parameter converter with the manager.
-   *
-   * @param \Drupal\Core\ParamConverter\ParamConverterInterface $param_converter
-   *   The added param converter instance.
-   * @param string $id
-   *   The parameter converter service id to register.
-   *
-   * @return $this
-   */
-  public function addConverter(ParamConverterInterface $param_converter, $id);
-
-  /**
    * Lazy-loads converter services.
    *
    * @param string $id