diff --git a/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php b/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
index ef6f82e..4c8feb0 100644
--- a/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
+++ b/core/lib/Drupal/Component/Plugin/Discovery/DerivativeDiscoveryDecorator.php
@@ -155,11 +155,7 @@ protected function encodePluginId($base_plugin_id, $derivative_id) {
    *
    * @param string $base_plugin_id
    *   The base plugin id of the plugin.
-<<<<<<< HEAD
    * @param mixed $base_definition
-=======
-   * @param array|object $base_definition
->>>>>>> applied patch
    *   The base plugin definition to build derivatives.
    *
    * @return \Drupal\Component\Plugin\Derivative\DerivativeInterface|null
diff --git a/core/lib/Drupal/Core/Entity/EntityManager.php b/core/lib/Drupal/Core/Entity/EntityManager.php
index 7821e8b..606feaa 100644
--- a/core/lib/Drupal/Core/Entity/EntityManager.php
+++ b/core/lib/Drupal/Core/Entity/EntityManager.php
@@ -131,13 +131,6 @@ protected function findDefinitions() {
     if ($this->alterHook) {
       $this->moduleHandler->alter($this->alterHook, $definitions);
     }
-    // If this plugin was provided by a module that does not exist, remove the
-    // plugin definition.
-    foreach ($definitions as $plugin_id => $plugin_definition) {
-      if (!in_array($plugin_definition->getProvider(), array('Core', 'Component')) && !$this->moduleHandler->moduleExists($plugin_definition->getProvider())) {
-        unset($definitions[$plugin_id]);
-      }
-    }
     return $definitions;
   }
 
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
index a74b755..fdda2e0 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityManagerTest.php
@@ -101,10 +101,6 @@ protected function setUp() {
       ->method('getImplementations')
       ->with('entity_type_build')
       ->will($this->returnValue(array()));
-    $this->moduleHandler->expects($this->any())
-      ->method('moduleExists')
-      ->with('test_module')
-      ->will($this->returnValue(TRUE));
 
     $this->cache = $this->getMock('Drupal\Core\Cache\CacheBackendInterface');
 
@@ -136,9 +132,6 @@ protected function setUpEntityManager($definitions = array()) {
       $entity_type->expects($this->any())
         ->method('getClass')
         ->will($this->returnValue($class));
-      $entity_type->expects($this->any())
-        ->method('getProvider')
-        ->will($this->returnValue('test_module'));
       $definitions_map[] = array($entity_type_id, $entity_type);
     }
     $this->discovery->expects($this->any())