diff --git a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php
index 1179ff8..71df6a2 100644
--- a/core/lib/Drupal/Core/Entity/EntityBCDecorator.php
+++ b/core/lib/Drupal/Core/Entity/EntityBCDecorator.php
@@ -50,6 +50,7 @@ class EntityBCDecorator implements IteratorAggregate, EntityInterface {
    *   A reference on the array of field objects of the entity.
    */
   function __construct(EntityInterface $decorated, &$values, &$fields) {
+    debug('created');
     $this->decorated = $decorated;
     $this->values = &$values;
     $this->fields = &$fields;
diff --git a/core/lib/Drupal/Core/Entity/EntityRenderController.php b/core/lib/Drupal/Core/Entity/EntityRenderController.php
index 6ccb5b9..ca87150 100644
--- a/core/lib/Drupal/Core/Entity/EntityRenderController.php
+++ b/core/lib/Drupal/Core/Entity/EntityRenderController.php
@@ -40,6 +40,7 @@ public function buildContent(array $entities = array(), $view_mode = 'full', $la
       $prepare[$view_mode][$entity->id()] = $entity;
     }
 
+    return;
     // Prepare and build field content, grouped by view mode.
     foreach ($prepare as $view_mode => $prepare_entities) {
       field_attach_prepare_view($this->entityType, $prepare_entities, $view_mode, $langcode);
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 5f929f3..ca9312b 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -1670,7 +1670,7 @@ function template_preprocess_comment(&$variables) {
   }
 
   // Preprocess fields.
-  field_attach_preprocess('comment', $comment->getBCEntity(), $variables['elements'], $variables);
+  //field_attach_preprocess('comment', $comment->getBCEntity(), $variables['elements'], $variables);
 
   // Helpful $content variable for templates.
   foreach (element_children($variables['elements']) as $key) {
diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
index 30fd347..5112e92 100644
--- a/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
+++ b/core/modules/comment/lib/Drupal/comment/Plugin/Core/Entity/Comment.php
@@ -26,7 +26,7 @@
  *   },
  *   base_table = "comment",
  *   uri_callback = "comment_uri",
- *   fieldable = TRUE,
+ *   fieldable = FALSE,
  *   static_cache = FALSE,
  *   entity_keys = {
  *     "id" = "cid",