diff --git a/phpBB/adm/style/acp_database.html b/phpBB/adm/style/acp_database.html
index cb2b6d0d39..b0b7c54dbb 100644
--- a/phpBB/adm/style/acp_database.html
+++ b/phpBB/adm/style/acp_database.html
@@ -58,7 +58,6 @@
 	<dl>
 		<dt><label for="type">{L_BACKUP_TYPE}{L_COLON}</label></dt>
 		<dd><label><input type="radio" class="radio" name="type" value="full" id="type" checked="checked" /> {L_FULL_BACKUP}</label>
-			<label><input type="radio" name="type" class="radio" value="structure" /> {L_STRUCTURE_ONLY}</label>
 			<label><input type="radio" class="radio" name="type" value="data" /> {L_DATA_ONLY}</label></dd>
 	</dl>
 	<dl>
diff --git a/phpBB/includes/acp/acp_database.php b/phpBB/includes/acp/acp_database.php
index b3c3a959a6..7b8dcc3ee5 100644
--- a/phpBB/includes/acp/acp_database.php
+++ b/phpBB/includes/acp/acp_database.php
@@ -73,20 +73,6 @@ class acp_database
 							trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
 						}
 
-						$store = true;
-						$structure = false;
-						$schema_data = false;
-
-						if ($type == 'full' || $type == 'structure')
-						{
-							$structure = true;
-						}
-
-						if ($type == 'full' || $type == 'data')
-						{
-							$schema_data = true;
-						}
-
 						@set_time_limit(1200);
 						@set_time_limit(0);
 
@@ -98,14 +84,14 @@ class acp_database
 						{
 							/** @var phpbb\db\extractor\extractor_interface $extractor Database extractor */
 							$extractor = $phpbb_container->get('dbal.extractor');
-							$extractor->init_extractor($format, $filename, $time, false, $store);
+							$extractor->init_extractor($format, $filename, $time, false, true);
 
 							$extractor->write_start($table_prefix);
 
 							foreach ($table as $table_name)
 							{
 								// Get the table structure
-								if ($structure)
+								if ($type == 'full')
 								{
 									// Add table structure to the backup
 									// This method also add a "drop the table if exists" after trying to write the table structure
@@ -135,11 +121,8 @@ class acp_database
 									}
 								}
 
-								// Write schema data if it exists
-								if ($schema_data)
-								{
-									$extractor->write_data($table_name);
-								}
+								// Only supported types are full and data, therefore always write the data
+								$extractor->write_data($table_name);
 							}
 
 							$extractor->write_end();
@@ -151,49 +134,48 @@ class acp_database
 
 						try
 						{
-							if ($store)
+							// Get file name
+							switch ($format)
 							{
-								// Get file name
-								switch ($format)
-								{
-									case 'text':
-										$ext = '.sql';
-										break;
-									case 'bzip2':
-										$ext = '.sql.gz2';
-										break;
-									case 'gzip':
-										$ext = '.sql.gz';
-										break;
-								}
+								case 'text':
+									$ext = '.sql';
+								break;
 
-								$file = $filename . $ext;
+								case 'bzip2':
+									$ext = '.sql.gz2';
+								break;
 
-								// Copy to storage using streams
-								$temp_dir = $this->temp->get_dir();
-
-								$fp = fopen($temp_dir . '/' . $file, 'rb');
-
-								if ($fp === false)
-								{
-									throw new \phpbb\exception\runtime_exception('CANNOT_OPEN_FILE');
-								}
-
-								$storage->write_stream($file, $fp);
-
-								if (is_resource($fp))
-								{
-									fclose($fp);
-								}
-
-								// Remove file from tmp
-								@unlink($temp_dir . '/' . $file);
-
-								// Save to database
-								$sql = "INSERT INTO " . $table_prefix . "backups (filename)
-									VALUES ('$file');";
-								$db->sql_query($sql);
+								case 'gzip':
+									$ext = '.sql.gz';
+								break;
 							}
+
+							$file = $filename . $ext;
+
+							// Copy to storage using streams
+							$temp_dir = $this->temp->get_dir();
+
+							$fp = fopen($temp_dir . '/' . $file, 'rb');
+
+							if ($fp === false)
+							{
+								throw new \phpbb\exception\runtime_exception('CANNOT_OPEN_FILE');
+							}
+
+							$storage->write_stream($file, $fp);
+
+							if (is_resource($fp))
+							{
+								fclose($fp);
+							}
+
+							// Remove file from tmp
+							@unlink($temp_dir . '/' . $file);
+
+							// Save to database
+							$sql = "INSERT INTO " . $table_prefix . "backups (filename)
+								VALUES ('$file');";
+							$db->sql_query($sql);
 						}
 						catch (\phpbb\exception\runtime_exception $e)
 						{
diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php
index 0572e9a2c9..f7b35443bb 100644
--- a/phpBB/language/en/acp/database.php
+++ b/phpBB/language/en/acp/database.php
@@ -72,7 +72,6 @@ $lang = array_merge($lang, array(
 	'START_RESTORE'			=> 'Start restore',
 	'STORE_AND_DOWNLOAD'	=> 'Store and download',
 	'STORE_LOCAL'			=> 'Store file locally',
-	'STRUCTURE_ONLY'		=> 'Structure only',
 
 	'TABLE_SELECT'		=> 'Table select',
 	'TABLE_SELECT_ERROR'=> 'You must select at least one table.',