diff --git a/lib/database/mysqlschema.php b/lib/database/mysqlschema.php
index 4f0c461040..d27333a392 100644
--- a/lib/database/mysqlschema.php
+++ b/lib/database/mysqlschema.php
@@ -616,9 +616,6 @@ class MysqlSchema extends Schema
             $col['type'] = $this->mapType($col);
             unset($col['size']);
         }
-        if (!common_config('db', 'mysql_foreign_keys')) {
-            unset($tableDef['foreign keys']);
-        }
         return $tableDef;
     }
 }
diff --git a/lib/database/schema.php b/lib/database/schema.php
index 6a085d343a..7feb214956 100644
--- a/lib/database/schema.php
+++ b/lib/database/schema.php
@@ -1115,6 +1115,9 @@ class Schema
         if (common_config('search', 'type') !== 'fulltext') {
             unset($tableDef['fulltext indexes']);
         }
+        if (!common_config('db', 'foreign_keys')) {
+            unset($tableDef['foreign keys']);
+        }
 
         return $tableDef;
     }
diff --git a/lib/util/default.php b/lib/util/default.php
index 6ce1c733e6..a6175e72d0 100644
--- a/lib/util/default.php
+++ b/lib/util/default.php
@@ -81,7 +81,7 @@ $default =
                 'annotate_queries' => false, // true to add caller comments to queries, eg /* POST Notice::saveNew */
                 'log_queries' => false, // true to log all DB queries
                 'log_slow_queries' => 0, // if set, log queries taking over N seconds
-                'mysql_foreign_keys' => false), // if set, enables experimental foreign key support on MySQL
+                'foreign_keys' => false), // if set, enables foreign key support
         'fix' =>
             array('fancyurls' => true,   // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
                 'legacy_http' => false,   // set this to true if you have upgraded your site from http=>https