.../lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php    |    7 -------
 .../Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php   |    3 +--
 .../ckeditor/Plugin/CKEditorPlugin/StylesCombo.php       |    3 +--
 .../lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php       |    1 -
 .../Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php |    3 +--
 .../ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php  |    3 +--
 .../Plugin/CKEditorPlugin/LlamaContextual.php            |    3 +--
 .../Plugin/CKEditorPlugin/LlamaContextualAndButton.php   |    3 +--
 .../edit/lib/Drupal/edit/Plugin/EditorManager.php        |   14 --------------
 .../lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php  |    3 +--
 .../lib/Drupal/edit/Plugin/edit/editor/FormEditor.php    |    3 +--
 .../edit_test/Plugin/edit/editor/WysiwygEditor.php       |    3 +--
 .../editor/lib/Drupal/editor/Annotation/Editor.php       |    7 -------
 .../editor/lib/Drupal/editor/Plugin/EditorBase.php       |    3 +--
 .../lib/Drupal/editor/Plugin/edit/editor/Editor.php      |    3 +--
 .../Drupal/editor_test/Plugin/Editor/UnicornEditor.php   |    1 -
 16 files changed, 11 insertions(+), 52 deletions(-)

diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php
index 112023d..542697a 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Annotation/CKEditorPlugin.php
@@ -32,11 +32,4 @@ class CKEditorPlugin extends Plugin {
    */
   public $label;
 
-  /**
-   * The name of the module providing the CKEditor plugin.
-   *
-   * @var string
-   */
-  public $module;
-
 }
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
index 4516762..e1f07d6 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/Internal.php
@@ -18,8 +18,7 @@
  *
  * @CKEditorPlugin(
  *   id = "internal",
- *   label = @Translation("CKEditor core"),
- *   module = "ckeditor"
+ *   label = @Translation("CKEditor core")
  * )
  */
 class Internal extends CKEditorPluginBase {
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
index e96eddf..6fa965a 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/CKEditorPlugin/StylesCombo.php
@@ -19,8 +19,7 @@
  *
  * @CKEditorPlugin(
  *   id = "stylescombo",
- *   label = @Translation("Styles dropdown"),
- *   module = "ckeditor"
+ *   label = @Translation("Styles dropdown")
  * )
  */
 class StylesCombo extends CKEditorPluginBase implements CKEditorPluginConfigurableInterface {
diff --git a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
index 0b8e758..0461dab 100644
--- a/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/lib/Drupal/ckeditor/Plugin/Editor/CKEditor.php
@@ -19,7 +19,6 @@
  * @Editor(
  *   id = "ckeditor",
  *   label = @Translation("CKEditor"),
- *   module = "ckeditor",
  *   supports_inline_editing = TRUE
  * )
  */
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
index 78e20e9..0fd3adf 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/Llama.php
@@ -27,8 +27,7 @@
  *
  * @CKEditorPlugin(
  *   id = "llama",
- *   label = @Translation("Llama"),
- *   module = "ckeditor_test"
+ *   label = @Translation("Llama")
  * )
  */
 class Llama extends PluginBase implements CKEditorPluginInterface {
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
index efe5803..ca9d455 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaButton.php
@@ -17,8 +17,7 @@
  *
  * @CKEditorPlugin(
  *   id = "llama_button",
- *   label = @Translation("Llama Button"),
- *   module = "ckeditor_test"
+ *   label = @Translation("Llama Button")
  * )
  */
 class LlamaButton extends Llama implements CKEditorPluginButtonsInterface {
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
index fb24d6b..e36ad31 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextual.php
@@ -18,8 +18,7 @@
  *
  * @CKEditorPlugin(
  *   id = "llama_contextual",
- *   label = @Translation("Contextual Llama"),
- *   module = "ckeditor_test"
+ *   label = @Translation("Contextual Llama")
  * )
  */
 class LlamaContextual extends Llama implements CKEditorPluginContextualInterface {
diff --git a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
index d3a9521..e6a60f4 100644
--- a/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
+++ b/core/modules/ckeditor/tests/modules/lib/Drupal/ckeditor_test/Plugin/CKEditorPlugin/LlamaContextualAndButton.php
@@ -21,8 +21,7 @@
  *
  * @CKEditorPlugin(
  *   id = "llama_contextual_and_button",
- *   label = @Translation("Contextual Llama With Button"),
- *   module = "ckeditor_test"
+ *   label = @Translation("Contextual Llama With Button")
  * )
  */
 class LlamaContextualAndButton extends Llama implements CKEditorPluginContextualInterface, CKEditorPluginButtonsInterface, CKEditorPluginConfigurableInterface {
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/EditorManager.php b/core/modules/edit/lib/Drupal/edit/Plugin/EditorManager.php
index eeb9aae..ae1fb34 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/EditorManager.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/EditorManager.php
@@ -30,23 +30,9 @@ class EditorManager extends PluginManagerBase {
    */
   public function __construct(\Traversable $namespaces) {
     $this->discovery = new AnnotatedClassDiscovery('edit/editor', $namespaces);
-    $this->discovery = new ProcessDecorator($this->discovery, array($this, 'processDefinition'));
     $this->discovery = new AlterDecorator($this->discovery, 'edit_editor');
     $this->discovery = new CacheDecorator($this->discovery, 'edit:editor');
     $this->factory = new DefaultFactory($this->discovery);
   }
 
-  /**
-   * Overrides \Drupal\Component\Plugin\PluginManagerBase::processDefinition().
-   */
-  public function processDefinition(&$definition, $plugin_id) {
-    parent::processDefinition($definition, $plugin_id);
-
-    // @todo Remove this check once http://drupal.org/node/1780396 is resolved.
-    if (!module_exists($definition['module'])) {
-      $definition = NULL;
-      return;
-    }
-  }
-
 }
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
index 00f8ce2..f8ff958 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/DirectEditor.php
@@ -15,8 +15,7 @@
  * Defines the direct editor.
  *
  * @Plugin(
- *   id = "direct",
- *   module = "edit"
+ *   id = "direct"
  * )
  */
 class DirectEditor extends EditorBase {
diff --git a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
index 7110605..9137398 100644
--- a/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
+++ b/core/modules/edit/lib/Drupal/edit/Plugin/edit/editor/FormEditor.php
@@ -15,8 +15,7 @@
  * Defines the form editor.
  *
  * @Plugin(
- *   id = "form",
- *   module = "edit"
+ *   id = "form"
  * )
  */
 class FormEditor extends EditorBase {
diff --git a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php
index 16aa4a8..52daa15 100644
--- a/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php
+++ b/core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/edit/editor/WysiwygEditor.php
@@ -16,8 +16,7 @@
  *
  * @Plugin(
  *   id = "wysiwyg",
- *   alternativeTo = {"direct"},
- *   module = "edit_test"
+ *   alternativeTo = {"direct"}
  * )
  */
 class WysiwygEditor extends EditorBase {
diff --git a/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php b/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php
index 5a45910..fd9b049 100644
--- a/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Annotation/Editor.php
@@ -33,13 +33,6 @@ class Editor extends Plugin {
   public $label;
 
   /**
-   * The name of the module providing the editor plugin.
-   *
-   * @var string
-   */
-  public $module;
-
-  /**
    * Whether the editor supports the inline editing provided by the Edit module.
    *
    * @var boolean
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
index 2a4b167..6993ed6 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/EditorBase.php
@@ -31,8 +31,7 @@
  * @code
  * @Editor(
  *   id = "myeditor",
- *   label = @Translation("My Editor"),
- *   module = "mymodule"
+ *   label = @Translation("My Editor")
  * )
  * @endcode
  */
diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php
index 8e6311c..a25966d 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/edit/editor/Editor.php
@@ -18,8 +18,7 @@
  *
  * @Plugin(
  *   id = "editor",
- *   alternativeTo = {"direct"},
- *   module = "editor"
+ *   alternativeTo = {"direct"}
  * )
  */
 class Editor extends PluginBase implements EditPluginInterface {
diff --git a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
index 52fd3ab..d87a4e8 100644
--- a/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
+++ b/core/modules/editor/tests/modules/lib/Drupal/editor_test/Plugin/Editor/UnicornEditor.php
@@ -18,7 +18,6 @@
  * @Editor(
  *   id = "unicorn",
  *   label = @Translation("Unicorn Editor"),
- *   module = "editor_test",
  *   supports_inline_editing = TRUE
  * )
  */