diff --git a/core/includes/entity.inc b/core/includes/entity.inc
index 7c6022c..3bbd4cb 100644
--- a/core/includes/entity.inc
+++ b/core/includes/entity.inc
@@ -488,8 +488,8 @@ function entity_form_submit(EntityInterface $entity, $operation = 'default', &$f
  * @return
  *   The processed form for the given entity and operation.
  *
- * @deprecated Use Drupal::entityManager()->getForm() instead
- *   or _entity_form from a routing.yml file instead of a page callback.
+ * @deprecated Use Drupal::entityManager()->getForm() or _entity_form from a
+ *   routing.yml file instead of a page callback.
  */
 function entity_get_form(EntityInterface $entity, $operation = 'default', array $form_state = array()) {
   return Drupal::entityManager()->getForm($entity, $operation, $form_state);
diff --git a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
index 53132ec..e5306a9 100644
--- a/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
+++ b/core/modules/field/lib/Drupal/field/Plugin/Core/Entity/FieldInstance.php
@@ -343,7 +343,7 @@ public function save() {
     }
     // Otherwise, the field instance is being updated.
     else {
-      $original = \Drupal::service('plugin.manager.entity')
+      $original = \Drupal::entityManager()
         ->getStorageController($this->entityType)
         ->loadUnchanged($this->getOriginalID());