diff --git a/lib/Cake/basics.php b/lib/Cake/basics.php
index d4c60917c..f73947a30 100644
--- a/lib/Cake/basics.php
+++ b/lib/Cake/basics.php
@@ -44,9 +44,7 @@
 function config() {
 	$args = func_get_args();
 	foreach ($args as $arg) {
-		if ($arg === 'database' && file_exists(APP . 'Config' . DS . 'database.php')) {
-			include_once(APP . 'Config' . DS . $arg . '.php');
-		} elseif (file_exists(APP . 'Config' . DS . $arg . '.php')) {
+		if (file_exists(APP . 'Config' . DS . $arg . '.php')) {
 			include_once(APP . 'Config' . DS . $arg . '.php');
 
 			if (count($args) == 1) {