diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php
index 370171c44f..2e9d67bd08 100644
--- a/libraries/Menu.class.php
+++ b/libraries/Menu.class.php
@@ -165,8 +165,8 @@ class PMA_Menu
     private function _getBreadcrumbs()
     {
         $retval = '';
-        $table = new PMA_Table($this->_table, $this->_db);
-        $tbl_is_view = $table->isView();
+        $tbl_is_view = $GLOBALS['dbi']->getTable($this->_db, $this->_table)
+            ->isView();
         $server_info = ! empty($GLOBALS['cfg']['Server']['verbose'])
             ? $GLOBALS['cfg']['Server']['verbose']
             : $GLOBALS['cfg']['Server']['host'];
@@ -299,8 +299,8 @@ class PMA_Menu
     private function _getTableTabs()
     {
         $db_is_system_schema = $GLOBALS['dbi']->isSystemSchema($this->_db);
-        $table = new PMA_Table($this->_table, $this->_db);
-        $tbl_is_view = $table->isView();
+        $tbl_is_view = $GLOBALS['dbi']->getTable($this->_db, $this->_table)
+            ->isView();
         $is_superuser = $GLOBALS['dbi']->isSuperuser();
         $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant')
             || $GLOBALS['dbi']->isUserType('create');
diff --git a/libraries/export.lib.php b/libraries/export.lib.php
index f3548fc6d5..d3bfdbce2f 100644
--- a/libraries/export.lib.php
+++ b/libraries/export.lib.php
@@ -850,10 +850,9 @@ function PMA_exportTable(
     // If this is an export of a single view, we have to export data;
     // for example, a PDF report
     // if it is a merge table, no data is exported
-    $table = new PMA_Table($table, $db);
     if (($whatStrucOrData == 'data'
         || $whatStrucOrData == 'structure_and_data')
-        && ! $table->isMerge()
+        && ! $GLOBALS['dbi']->getTable($db, $table)->isMerge()
     ) {
         if (! empty($sql_query)) {
             // only preg_replace if needed
diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 5f92e6030c..33563716de 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -467,8 +467,7 @@ function PMA_copyTables($tables_full, $move, $db)
 
         // do not copy the data from a Merge table
         // note: on the calling FORM, 'data' means 'structure and data'
-        $table = new PMA_Table($each_table, $db);
-        if ($table->isMerge()) {
+        if ($GLOBALS['dbi']->getTable($db, $each_table)->isMerge()) {
             if ($this_what == 'data') {
                 $this_what = 'structure';
             }
diff --git a/libraries/tbl_columns_definition_form.inc.php b/libraries/tbl_columns_definition_form.inc.php
index 4435999c68..9dd8a34677 100644
--- a/libraries/tbl_columns_definition_form.inc.php
+++ b/libraries/tbl_columns_definition_form.inc.php
@@ -239,8 +239,8 @@ for ($columnNumber = 0; $columnNumber < $num_fields; $columnNumber++) {
             'VIRTUAL', 'PERSISTENT', 'VIRTUAL GENERATED', 'STORED GENERATED'
         );
         if (in_array($columnMeta['Extra'], $virtual)) {
-            $table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
-            $expressions = $table->getColumnGenerationExpression(
+            $tableObj = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
+            $expressions = $tableObj->getColumnGenerationExpression(
                 $columnMeta['Field']
             );
             $columnMeta['Expression'] = $expressions[$columnMeta['Field']];
diff --git a/tbl_tracking.php b/tbl_tracking.php
index 8153ea34af..7f8c44613b 100644
--- a/tbl_tracking.php
+++ b/tbl_tracking.php
@@ -192,8 +192,8 @@ if ($last_version > 0) {
     );
 }
 
-$table = new PMA_Table($GLOBALS['table'], $GLOBALS['db']);
-$type = $table->isView() ? 'view' : 'table';
+$type = $GLOBALS['dbi']->getTable($GLOBALS['db'], $GLOBALS['table'])
+    ->isView() ? 'view' : 'table';
 $html .= PMA_getHtmlForDataDefinitionAndManipulationStatements(
     'tbl_tracking.php' . $url_query,
     $last_version,