diff --git a/sql/field.cc b/sql/field.cc
index 4a81ff09a29..862c40b847d 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -2569,9 +2569,7 @@ Field *Field::make_new_field(MEM_ROOT *root, TABLE *new_table,
   */
   tmp->unireg_check= Field::NONE;
   tmp->flags&= (NOT_NULL_FLAG | BLOB_FLAG | UNSIGNED_FLAG |
-                ZEROFILL_FLAG | BINARY_FLAG | ENUM_FLAG | SET_FLAG |
-                VERS_ROW_START | VERS_ROW_END |
-                VERS_UPDATE_UNVERSIONED_FLAG);
+                ZEROFILL_FLAG | BINARY_FLAG | ENUM_FLAG | SET_FLAG);
   tmp->reset_fields();
   tmp->invisible= VISIBLE;
   return tmp;
diff --git a/sql/sql_class.h b/sql/sql_class.h
index b7acea5ed3e..5085db8f837 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -5577,6 +5577,7 @@ public:
 
   bool vers_insert_history_fast(const TABLE *table)
   {
+    DBUG_ASSERT(table->versioned());
     return table->versioned(VERS_TIMESTAMP) &&
            (variables.option_bits & OPTION_INSERT_HISTORY) &&
             lex->duplicates == DUP_ERROR;