diff --git a/sql/sql_select.cc b/sql/sql_select.cc
index c625315f873..e96980bc3b2 100644
--- a/sql/sql_select.cc
+++ b/sql/sql_select.cc
@@ -843,10 +843,7 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr
     Item *row_end=
         newx Item_field(thd, &this->context, table->db.str, table->alias.str, fend);
 
-    bool tmp_from_ib=
-        table->table->s->table_category == TABLE_CATEGORY_TEMPORARY &&
-        table->table->vers_start_field()->type() == MYSQL_TYPE_LONGLONG;
-    bool timestamps_only= table->table->versioned(VERS_TIMESTAMP) && !tmp_from_ib;
+    bool timestamps_only= table->table->versioned(VERS_TIMESTAMP);
 
     if (vers_conditions)
     {
@@ -868,7 +865,7 @@ int SELECT_LEX::vers_setup_conds(THD *thd, TABLE_LIST *tables, COND **where_expr
     // have uint64 type of sys_trx_(start|end) field.
     // They need special handling.
     TABLE *t= table->table;
-    if (tmp_from_ib || t->versioned(VERS_TIMESTAMP) ||
+    if (t->versioned(VERS_TIMESTAMP) ||
         thd->variables.vers_innodb_algorithm_simple)
     {
       if (vers_conditions)