diff --git a/../drupal8.field-system.1987398-43.patch b/../drupal8.field-system.1987398-47.patch
index 55aa392..685ea83 100644
--- a/../drupal8.field-system.1987398-43.patch
+++ b/../drupal8.field-system.1987398-47.patch
@@ -122,7 +122,7 @@ index 6f99192..4912a26 100644
  
  /**
 diff --git a/core/modules/field/field.module b/core/modules/field/field.module
-index 7621595..bd0698d 100644
+index 7621595..6594e1a 100644
 --- a/core/modules/field/field.module
 +++ b/core/modules/field/field.module
 @@ -134,9 +134,12 @@ function field_theme() {
@@ -138,7 +138,18 @@ index 7621595..bd0698d 100644
      ),
    );
  }
-@@ -701,88 +704,6 @@ function template_preprocess_field(&$variables, $hook) {
+@@ -688,9 +691,7 @@ function template_preprocess_field(&$variables, $hook) {
+   // $item->_attributes) within hook_entity_prepare_view(). Some field
+   // formatters move those attributes into some nested formatter-specific
+   // element in order have them rendered on the desired HTML element (e.g., on
+-  // the <a> element of a field item being rendered as a link). Other field
+-  // formatters leave them within $element['#items'][$delta]['_attributes'] to
+-  // be rendered on the item wrappers provided by theme_field().
++  // the <a> element of a field item being rendered as a link).
+   foreach ($variables['items'] as $delta => $item) {
+     $variables['item_attributes'][$delta] = !empty($element['#items'][$delta]['_attributes']) ? new Attribute($element['#items'][$delta]['_attributes']) : clone($default_attributes);
+   }
+@@ -701,88 +702,6 @@ function template_preprocess_field(&$variables, $hook) {
   */
  
  /**
@@ -229,10 +240,10 @@ index 7621595..bd0698d 100644
   * @param object $ids
 diff --git a/core/modules/field/templates/field-multiple-value-form.html.twig b/core/modules/field/templates/field-multiple-value-form.html.twig
 new file mode 100644
-index 0000000..fd1aba1
+index 0000000..e6f0ba0
 --- /dev/null
 +++ b/core/modules/field/templates/field-multiple-value-form.html.twig
-@@ -0,0 +1,39 @@
+@@ -0,0 +1,38 @@
 +{#
 +/**
 + * @file
@@ -250,7 +261,6 @@ index 0000000..fd1aba1
 + * - button: "Add another item" button.
 + *
 + * @see template_preprocess_field()
-+ * @see template_process_field()
 + *
 + * @ingroup themeable
 + */
@@ -273,10 +283,15 @@ index 0000000..fd1aba1
 +  {% endfor %}
 +{% endif %}
 diff --git a/core/modules/field/templates/field.html.twig b/core/modules/field/templates/field.html.twig
-index 4b13366..5b771c7 100644
+index 4b13366..2bcab30 100644
 --- a/core/modules/field/templates/field.html.twig
 +++ b/core/modules/field/templates/field.html.twig
-@@ -30,12 +30,6 @@
+@@ -25,17 +25,10 @@
+  * - item_attributes: List of HTML attributes for each item.
+  *
+  * @see template_preprocess_field()
+- * @see theme_field()
+  *
   * @ingroup themeable
   */
  #}
@@ -324,10 +339,10 @@ index 593923a..bbd02b3 100644
 -}
 diff --git a/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig b/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
 new file mode 100644
-index 0000000..111248a
+index 0000000..253a238
 --- /dev/null
 +++ b/core/themes/bartik/templates/field--taxonomy-term-reference.html.twig
-@@ -0,0 +1,30 @@
+@@ -0,0 +1,29 @@
 +{#
 +/**
 + * @file
@@ -343,7 +358,6 @@ index 0000000..111248a
 + * - item_attributes: HTML attributes for each item.
 + *
 + * @see template_preprocess_field()
-+ * @see template_process_field()
 + *
 + * @ingroup themeable
 + */