diff --git a/core/modules/field/field.module b/core/modules/field/field.module
index 5dc8d02..0a99949 100644
--- a/core/modules/field/field.module
+++ b/core/modules/field/field.module
@@ -384,12 +384,9 @@ function template_preprocess_field(&$variables, $hook) {
   $variables['entity_type_css'] = strtr($element['#entity_type'], '_', '-');
   $variables['field_name_css'] = strtr($element['#field_name'], '_', '-');
   $variables['field_type_css'] = strtr($element['#field_type'], '_', '-');
+  $variables['label_position'] = $element['#label_display'];
   $variables['attributes']['class'] = array(
-    'field',
-    'field-' . $variables['entity_type_css'] . '--' . $variables['field_name_css'],
-    'field-name-' . $variables['field_name_css'],
-    'field-type-' . $variables['field_type_css'],
-    'field-label-' . $element['#label_display'],
+    // 'field-label-' . $element['#label_display'],
   );
   // Add a "clearfix" class to the wrapper since we float the label and the
   // field items in field.module.css if the label is inline.
diff --git a/core/modules/field/templates/field.html.twig b/core/modules/field/templates/field.html.twig
index a0d527a..d23ee6b 100644
--- a/core/modules/field/templates/field.html.twig
+++ b/core/modules/field/templates/field.html.twig
@@ -23,13 +23,17 @@
  * - content_attributes: HTML attributes for the content.
  * - items: List of all the field items.
  * - item_attributes: List of HTML attributes for each item.
+ * - entity_type_css: The entity type in a CSS friendly string.
+ * - field_name_css: The field name in a CSS friendly string.
+ * - field_type_css: The field type in a CSS friendly string.
+ * - label_position: The position of the label in relation to the field value.
  *
  * @see template_preprocess_field()
  *
  * @ingroup themeable
  */
 #}
-<div{{ attributes }}>
+<div class="field field-{{entity_type_css}}--{{field_name_css}} field-name-{{field_name_css}} field-type-{{field_type_css}} field-label-{{label_position}}{{attributes.class}}" {{ attributes }}>
   {% if not label_hidden %}
     <div class="field-label"{{ title_attributes }}>{{ label }}:&nbsp;</div>
   {% endif %}
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
old mode 100644
new mode 100755