diff --git a/e107_handlers/e_db_legacy_trait.php b/e107_handlers/e_db_legacy_trait.php
index f0634c6c0..aa599cec7 100644
--- a/e107_handlers/e_db_legacy_trait.php
+++ b/e107_handlers/e_db_legacy_trait.php
@@ -38,11 +38,6 @@
 
 		public function db_Fetch($type = null)
 		{
-			if (defined('e_LEGACY_MODE') && !is_int($type))
-			{
-				return $this->fetch('both');
-		    }
-
 			return $this->fetch($type);
 		}
 
diff --git a/e107_tests/tests/unit/e107pluginTest.php b/e107_tests/tests/unit/e107pluginTest.php
index 221ec3c41..e611ffd4f 100644
--- a/e107_tests/tests/unit/e107pluginTest.php
+++ b/e107_tests/tests/unit/e107pluginTest.php
@@ -405,7 +405,7 @@
 				unset($actual[$unimportant_key]);
 			}
 
-			// Filter out cruft from e_LEGACY_MODE database output
+			// Filter out cruft from MYSQL_BOTH database output
 			foreach ($actual as $key => $value)
 			{
 				if (is_int($key)) unset($actual[$key]);
diff --git a/e107_tests/tests/unit/e_db_abstractTest.php b/e107_tests/tests/unit/e_db_abstractTest.php
index 06866b2dd..2af2b93e7 100644
--- a/e107_tests/tests/unit/e_db_abstractTest.php
+++ b/e107_tests/tests/unit/e_db_abstractTest.php
@@ -651,7 +651,8 @@ abstract class e_db_abstractTest extends \Codeception\Test\Unit
 		$this->db->select('user', '*', 'user_id = 1');
 		$row = $this->db->db_Fetch();
 		$this->assertEquals("e107", $row['user_name']);
-		$this->assertEquals("e107", $row[1]);
+		$this->assertNull($row[0]);
+		$this->assertNull($row[1]);
 
 		// legacy tests
 		$this->db->select('user', '*', 'user_id = 1');
diff --git a/e107_tests/tests/unit/e_db_pdoTest.php b/e107_tests/tests/unit/e_db_pdoTest.php
index cfcc3726f..5d5b3d4bf 100644
--- a/e107_tests/tests/unit/e_db_pdoTest.php
+++ b/e107_tests/tests/unit/e_db_pdoTest.php
@@ -30,7 +30,6 @@ class e_db_pdoTest extends e_db_abstractTest
 			$this->fail("Couldn't load e_db_pdo object");
 		}
 
-		define('e_LEGACY_MODE', true);
 		$this->db->__construct();
 		$this->loadConfig();