commit 101dd2695cbd0ebe0bc0d8b555a00227b0eac4f5
Author: Chris Burgess <chrisburgess@catalyst.net.nz>
Date:   Fri Aug 30 12:59:34 2019 +1200

    Issue #3078158 - Handle varying length plugin types when deriving from Entity, EntityRevision

diff --git a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
index 1279200559..41a6a42ad3 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/Entity.php
@@ -119,10 +119,10 @@ public static function create(ContainerInterface $container, array $configuratio
    * @return string
    *   The entity type.
    */
-  protected static function getEntityTypeId($plugin_id) {
-    // Remove "entity:".
-    return substr($plugin_id, 7);
-  }
+   protected static function getEntityTypeId($plugin_id) {
+     // Remove entity:, entity_revision: etc.
+     return substr($plugin_id, strpos($plugin_id, ':') + 1);
+   }
 
   /**
    * Gets the bundle for the row taking into account the default.
diff --git a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
index 4b651fe9f8..55ac460b5d 100644
--- a/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
+++ b/core/modules/migrate/src/Plugin/migrate/destination/EntityRevision.php
@@ -121,14 +121,6 @@ public function __construct(array $configuration, $plugin_id, $plugin_definition
     parent::__construct($configuration, $plugin_id, $plugin_definition, $migration, $storage, $bundles, $entity_field_manager, $field_type_manager);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  protected static function getEntityTypeId($plugin_id) {
-    // Remove entity_revision:
-    return substr($plugin_id, 16);
-  }
-
   /**
    * Gets the entity.
    *
