diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index 65f1b07fd8..3d35280671 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -247,7 +247,10 @@ define('BANLIST_TABLE',				$table_prefix . 'banlist');
 define('BBCODES_TABLE',				$table_prefix . 'bbcodes');
 define('BOOKMARKS_TABLE',			$table_prefix . 'bookmarks');
 define('BOTS_TABLE',				$table_prefix . 'bots');
-@define('CONFIG_TABLE',				$table_prefix . 'config');
+if (!defined('CONFIG_TABLE'))
+{
+	define('CONFIG_TABLE',			$table_prefix . 'config');
+}
 define('CONFIG_TEXT_TABLE',			$table_prefix . 'config_text');
 define('CONFIRM_TABLE',				$table_prefix . 'confirm');
 define('DISALLOW_TABLE',			$table_prefix . 'disallow');
diff --git a/phpBB/install/app.php b/phpBB/install/app.php
index 36d16e914b..bf2c81bfcc 100644
--- a/phpBB/install/app.php
+++ b/phpBB/install/app.php
@@ -16,10 +16,7 @@
  */
 define('IN_PHPBB', true);
 define('IN_INSTALL', true);
-if (!defined('PHPBB_ENVIRONMENT'))
-{
-	define('PHPBB_ENVIRONMENT', 'production');
-}
+
 $phpbb_root_path = '../';
 $phpEx = substr(strrchr(__FILE__, '.'), 1);