diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php
index c55b764ded..0cd562b264 100644
--- a/phpBB/develop/create_schema_files.php
+++ b/phpBB/develop/create_schema_files.php
@@ -24,14 +24,13 @@ $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);
 include($phpbb_root_path . 'common.' . $phpEx);
 
-$phpbb_extension_manager = $phpbb_container->get('ext.manager');
-$finder = $phpbb_extension_manager->get_finder();
-$finder = $finder
+$classes = $phpbb_container->get('ext.manager')
+	->get_finder()
 	->core_path('phpbb/db/migration/data/')
-	->extension_prefix('migration/');
+	->get_classes();
 $db_tools = new \phpbb\db\tools($db, true);
 
-$schema_generator = new \phpbb\db\migration\schema_generator($finder, $config, $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix);
+$schema_generator = new \phpbb\db\migration\schema_generator($classes, $config, $db, $db_tools, $phpbb_root_path, $phpEx, $table_prefix);
 $original_schema_data = $schema_generator->get_schema();
 $dbms_type_map = phpbb\db\tools::get_dbms_type_map();
 
diff --git a/phpBB/phpbb/db/migration/schema_generator.php b/phpBB/phpbb/db/migration/schema_generator.php
index fb47cdb22b..a7e2fa8f06 100644
--- a/phpBB/phpbb/db/migration/schema_generator.php
+++ b/phpBB/phpbb/db/migration/schema_generator.php
@@ -25,8 +25,8 @@ class schema_generator
 	/** @var \phpbb\db\tools */
 	protected $db_tools;
 
-	/** @var \phpbb\extension\finder */
-	protected $finder;
+	/** @var array */
+	protected $class_names;
 
 	/** @var string */
 	protected $table_prefix;
@@ -43,12 +43,12 @@ class schema_generator
 	/**
 	* Constructor
 	*/
-	public function __construct(\phpbb\extension\finder $finder, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\db\tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
+	public function __construct(array $class_names, \phpbb\config\config $config, \phpbb\db\driver\driver $db, \phpbb\db\tools $db_tools, $phpbb_root_path, $php_ext, $table_prefix)
 	{
 		$this->config = $config;
 		$this->db = $db;
 		$this->db_tools = $db_tools;
-		$this->finder = $finder;
+		$this->class_names = $class_names;
 		$this->phpbb_root_path = $phpbb_root_path;
 		$this->php_ext = $php_ext;
 		$this->table_prefix = $table_prefix;
@@ -66,7 +66,7 @@ class schema_generator
 			return $this->tables;
 		}
 
-		$migrations = $this->finder->get_classes();
+		$migrations = $this->class_names;
 
 		$tree = array();
 		while (!empty($migrations))