diff --git a/lib/Cake/Model/ConnectionManager.php b/lib/Cake/Model/ConnectionManager.php
index e07371a03..b6ff55252 100644
--- a/lib/Cake/Model/ConnectionManager.php
+++ b/lib/Cake/Model/ConnectionManager.php
@@ -165,14 +165,11 @@ class ConnectionManager {
 			return false;
 		}
 
-		if (!empty($conn['parent'])) {
-			$_this->loadDataSource($conn['parent']);
-		}
-
 		$conn = array_merge(array('plugin' => null, 'classname' => null, 'parent' => null), $conn);
-		$class = "{$conn['plugin']}.{$conn['classname']}";
+		$class = trim("{$conn['plugin']}.{$conn['classname']}", '.');
 
-		if (!App::import('Datasource', $class, !is_null($conn['plugin']))) {
+		App::uses($class, 'Model/Datasource');
+		if (class_exists($class)) {
 			trigger_error(sprintf(__('ConnectionManager::loadDataSource - Unable to import DataSource class %s'), $class), E_USER_ERROR);
 			return null;
 		}
diff --git a/cake/libs/model/datasources/dbo/dbo_mysql.php b/lib/Cake/Model/Datasource/Database/Mysql.php
similarity index 100%
rename from cake/libs/model/datasources/dbo/dbo_mysql.php
rename to lib/Cake/Model/Datasource/Database/Mysql.php