diff --git a/libraries/operations.lib.php b/libraries/operations.lib.php
index 64bd39d0c1..16e8ed4a55 100644
--- a/libraries/operations.lib.php
+++ b/libraries/operations.lib.php
@@ -1861,7 +1861,7 @@ function PMA_getTableAltersArray($is_myisam_or_aria, $is_isam, $pack_keys,
  */
 function PMA_setGlobalVariablesForEngine($tbl_storage_engine)
 {
-    $upperTblStorEngine = /*overload*/mb_strtoupper($tbl_storage_engine);
+    $upperTblStorEngine = $tbl_storage_engine;
 
     //Options that apply to MYISAM usually apply to ARIA
     $is_myisam_or_aria = ($upperTblStorEngine == 'MYISAM'
diff --git a/tbl_operations.php b/tbl_operations.php
index 3dcd5b534c..3f3cd83bc3 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -57,9 +57,6 @@ $GLOBALS['dbi']->selectDb($GLOBALS['db']);
  */
 require 'libraries/tbl_info.inc.php';
 
-// define some variables here, for improved syntax in the conditionals
-$is_myisam_or_aria = $is_isam = $is_innodb = $is_berkeleydb = false;
-$is_aria = $is_pbxt = false;
 // set initial value of these variables, based on the current table engine
 list($is_myisam_or_aria, $is_innodb, $is_isam,
     $is_berkeleydb, $is_aria, $is_pbxt
@@ -136,7 +133,7 @@ if (isset($_REQUEST['submitoptions'])) {
     }
 
     if (! empty($_REQUEST['new_tbl_storage_engine'])
-        && /*overload*/mb_strtolower($_REQUEST['new_tbl_storage_engine']) !== /*overload*/mb_strtolower($tbl_storage_engine)
+        && /*overload*/mb_strtolower($_REQUEST['new_tbl_storage_engine']) !== $tbl_storage_engine
     ) {
         $new_tbl_storage_engine = $_REQUEST['new_tbl_storage_engine'];
         // reset the globals for the new engine