diff --git a/core/modules/comment/comment.install b/core/modules/comment/comment.install
index 0ab0897..dce370c 100644
--- a/core/modules/comment/comment.install
+++ b/core/modules/comment/comment.install
@@ -763,10 +763,11 @@ function comment_update_8007(&$sandbox) {
  * Removes the existing fields.
  */
 function comment_update_8008(&$sandbox) {
+  debug('comment_update_8008');
   // Remove the {node}.comment field.
-  db_drop_field('node', 'comment');
+  //db_drop_field('node', 'comment');
   // Remove the {node_revision}.comment field.
-  db_drop_field('node_revision', 'comment');
+  //db_drop_field('node_revision', 'comment');
 }
 
 /**
diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index dc20e25..4ac4601 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -389,6 +389,7 @@ function field_update_8002() {
  * Convert fields and instances to config.
  */
 function field_update_8003() {
+  debug('field_update_8003');
   $uuid = new Uuid();
   $manifest_ids = array('fields' => array(), 'instances' => array());
 
diff --git a/core/modules/forum/forum.install b/core/modules/forum/forum.install
index aefdf0a..ee052b3 100644
--- a/core/modules/forum/forum.install
+++ b/core/modules/forum/forum.install
@@ -116,7 +116,14 @@ function forum_enable() {
   $types = node_type_get_types();
   node_add_body_field($types['forum']);
   // Add the comment field.
-  if (!field_read_field('comment_node_forum', array('include_inactive' => TRUE))) {
+  $field = entity_load('field_entity', 'comment_node_forum', TRUE);
+  debug($field, 'field');
+  $table = db_table_exists('field_data_comment_node_forum ');
+  debug($table, 'table');
+  $config = config('field.field.comment_node_forum');
+  debug($config->isNew(), 'config');
+  debug($config->getName(), 'config');
+  if (!$field) {//!field_read_field('comment_node_forum', array('include_inactive' => TRUE))) {
     comment_add_default_comment_field('node', 'forum', 'comment_node_forum', COMMENT_OPEN);
   }
 }
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 07e22e3..03e430b 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -1112,6 +1112,7 @@ function node_update_8017(&$sandbox) {
  * Upgrade node schema to the standard entity SQL schema: delete old fields.
  */
 function node_update_8018() {
+  debug('node_update_8018');
   $indexes = array('node_changed', 'node_created', 'node_frontpage', 'node_status_type', 'node_title_type', 'uid');
   foreach ($indexes as $index) {
     db_drop_index('node', $index);