diff --git a/libraries/classes/Engines/Innodb.php b/libraries/classes/Engines/Innodb.php
index 5b32fb5f3958..6f050881a5dc 100644
--- a/libraries/classes/Engines/Innodb.php
+++ b/libraries/classes/Engines/Innodb.php
@@ -281,18 +281,6 @@ public function getMysqlHelpPage()
         return 'innodb-storage-engine';
     }
 
-    /**
-     * Gets the InnoDB plugin version number
-     *
-     * @return string the version number, or empty if not running as a plugin
-     */
-    public function getInnodbPluginVersion()
-    {
-        global $dbi;
-
-        return $dbi->fetchValue('SELECT @@innodb_version;') ?: '';
-    }
-
     /**
      * Gets the InnoDB file format
      *
@@ -300,19 +288,15 @@ public function getInnodbPluginVersion()
      *
      * @return string|null the InnoDB file format
      */
-    public function getInnodbFileFormat(): ?string
+    public function getInnodbFileFormat()
     {
         global $dbi;
 
-        $value = $dbi->fetchValue("SHOW GLOBAL VARIABLES LIKE 'innodb_file_format';", 1);
-
-        if ($value === false) {
-            // This variable does not exist anymore on MariaDB >= 10.6.0
-            // This variable does not exist anymore on MySQL >= 8.0.0
-            return null;
-        }
-
-        return (string) $value;
+        return
+          ($dbi->isMariaDB() && $dbi->getVersion() >= 100600)
+          || ($dbi->isMySql() && $dbi->getVersion() >= 80000)
+            ? ''
+            : $dbi->fetchValue("SHOW GLOBAL VARIABLES LIKE 'innodb_file_format';", 1);
     }
 
     /**
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
index 842d3a0ddb0a..731d86bb9d86 100644
--- a/libraries/classes/Operations.php
+++ b/libraries/classes/Operations.php
@@ -519,11 +519,7 @@ public function getPossibleRowFormat()
 
         /** @var Innodb $innodbEnginePlugin */
         $innodbEnginePlugin = StorageEngine::getEngine('Innodb');
-        $innodbPluginVersion = $innodbEnginePlugin->getInnodbPluginVersion();
-        $innodb_file_format = '';
-        if (! empty($innodbPluginVersion)) {
-            $innodb_file_format = $innodbEnginePlugin->getInnodbFileFormat() ?? '';
-        }
+        $innodb_file_format = $innodbEnginePlugin->getInnodbFileFormat();
 
         /**
          * Newer MySQL/MariaDB always return empty a.k.a '' on $innodb_file_format otherwise
diff --git a/test/classes/Engines/InnodbTest.php b/test/classes/Engines/InnodbTest.php
index 51f241512dbf..88dbdbd378db 100644
--- a/test/classes/Engines/InnodbTest.php
+++ b/test/classes/Engines/InnodbTest.php
@@ -225,14 +225,6 @@ public function testGetMysqlHelpPage(): void
         self::assertSame('innodb-storage-engine', $this->object->getMysqlHelpPage());
     }
 
-    /**
-     * Test for getInnodbPluginVersion
-     */
-    public function testGetInnodbPluginVersion(): void
-    {
-        self::assertSame('1.1.8', $this->object->getInnodbPluginVersion());
-    }
-
     /**
      * Test for supportsFilePerTable
      */