diff --git a/libraries/config.default.php b/libraries/config.default.php
index b2a393275..4b3978777 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1441,16 +1441,9 @@ $cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
 /**
  *
  *
- * @global boolean $cfg['Export']['sql_structure']
+ * @global string $cfg['Export']['sql_structure_or_data']
  */
-$cfg['Export']['sql_structure'] = true;
-
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_data']
- */
-$cfg['Export']['sql_data'] = true;
+$cfg['Export']['sql_structure_or_data'] = 'structure_and_data';
 
 /**
  *
@@ -1538,13 +1531,6 @@ $cfg['Export']['sql_dates'] = false;
  */
 $cfg['Export']['sql_relation'] = false;
 
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_columns']
- */
-$cfg['Export']['sql_columns'] = true;
-
 /**
  *
  *
@@ -1580,13 +1566,6 @@ $cfg['Export']['sql_hex_for_blob'] = true;
  */
 $cfg['Export']['sql_type'] = 'insert';
 
-/**
- *
- *
- * @global boolean $cfg['Export']['sql_extended']
- */
-$cfg['Export']['sql_extended'] = true;
-
 /**
  *
  *
@@ -1615,6 +1594,20 @@ $cfg['Export']['sql_mime'] = false;
  */
 $cfg['Export']['sql_header_comment'] = '';
 
+/**
+ *
+ *
+ * @global boolean $cfg['Export']['sql_create_table_statements']
+ */
+$cfg['Export']['sql_create_table_statements'] = true;
+
+/**
+ * Whether to use complete inserts, extended inserts, both, or neither
+ *
+ * @global string $cfg['Export']['sql_insert_syntax']
+ */
+$cfg['Export']['sql_insert_syntax'] = 'both';
+
 /**
  *
  *