diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 4ebcec38d5..dac39e5940 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2901,24 +2901,21 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
 
 			// Check the error reporting level and return if the error level does not match
 			// Additionally do not display notices if we suppress them via @
-			// If DEBUG_EXTRA is defined the default level is E_ALL
-			if (($errno & ((defined('DEBUG_EXTRA') && error_reporting()) ? E_ALL : error_reporting())) == 0)
+			// If DEBUG is defined the default level is E_ALL
+			if (($errno & ((defined('DEBUG') && error_reporting()) ? E_ALL : error_reporting())) == 0)
 			{
 				return;
 			}
 
-			if (defined('DEBUG'))
+			if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
 			{
-				if (strpos($errfile, 'cache') === false && strpos($errfile, 'template.') === false)
-				{
-					// remove complete path to installation, with the risk of changing backslashes meant to be there
-					$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
-					$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
+				// remove complete path to installation, with the risk of changing backslashes meant to be there
+				$errfile = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $errfile);
+				$msg_text = str_replace(array(phpbb_realpath($phpbb_root_path), '\\'), array('', '/'), $msg_text);
 
-					echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
-				}
+				echo '<b>[phpBB Debug] PHP Notice</b>: in file <b>' . $errfile . '</b> on line <b>' . $errline . '</b>: <b>' . $msg_text . '</b><br />' . "\n";
 			}
-		
+
 		break;
 
 		case E_USER_ERROR:
diff --git a/phpBB/includes/functions_messenger.php b/phpBB/includes/functions_messenger.php
index 75eda9b10c..51553ec296 100644
--- a/phpBB/includes/functions_messenger.php
+++ b/phpBB/includes/functions_messenger.php
@@ -962,7 +962,7 @@ class smtp_class
 
 	function smtp_class()
 	{
-		if (defined('DEBUG_EXTRA'))
+		if (defined('DEBUG'))
 		{
 			$this->backtrace = true;
 			$this->backtrace_log = array();
diff --git a/phpBB/install/install_install.php b/phpBB/install/install_install.php
index a78ed995af..472b79cfa7 100755
--- a/phpBB/install/install_install.php
+++ b/phpBB/install/install_install.php
@@ -792,7 +792,7 @@ class install_install extends module
 		$config_data .= "\$load_extensions = '$load_extensions';\n\n";
 		$config_data .= "@define('PHPBB_INSTALLED', true);\n";
 		$config_data .= "@define('DEBUG', true);\n"; // @todo Comment out when final
-		$config_data .= "@define('DEBUG_EXTRA', true);\n"; // @todo Comment out when final
+		$config_data .= "// @define('DEBUG_EXTRA', true);\n";
 		$config_data .= '?' . '>'; // Done this to prevent highlighting editors getting confused!
 	
 		// Attempt to write out the config file directly. If it works, this is the easiest way to do it ...