diff --git a/system/core/Loader.php b/system/core/Loader.php
index b7380c0509..aa682c99ee 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -291,7 +291,7 @@ public function model($model, $name = '', $db_conn = FALSE)
 				$db_conn = '';
 			}
 
-			$this->database($db_conn, FALSE, TRUE);
+			$this->database($db_conn);
 		}
 
 		// Note: All of the code under this condition used to be just:
diff --git a/user_guide_src/source/libraries/loader.rst b/user_guide_src/source/libraries/loader.rst
index 4d3d512361..241e5a57e8 100644
--- a/user_guide_src/source/libraries/loader.rst
+++ b/user_guide_src/source/libraries/loader.rst
@@ -317,11 +317,10 @@ Class Reference
 			$this->load->model('model_name', 'fubar');
 			$this->fubar->method();
 
-	.. php:method:: database([$params = ''[, $return = FALSE[, $query_builder = NULL]]])
+	.. php:method:: database([$params = ''[, $return = FALSE]])
 
 		:param	mixed	$params: Database group name or configuration options
 		:param	bool	$return: Whether to return the loaded database object
-		:param	bool	$query_builder: Whether to load the Query Builder
 		:returns:	Loaded CI_DB instance or FALSE on failure if $return is set to TRUE, otherwise CI_Loader instance (method chaining)
 		:rtype:	mixed