diff --git a/wp-includes/ms-deprecated.php b/wp-includes/ms-deprecated.php
index 6b7534c419..3f4579bc0b 100644
--- a/wp-includes/ms-deprecated.php
+++ b/wp-includes/ms-deprecated.php
@@ -101,4 +101,13 @@ function get_current_user_id() {
 	return $current_user->ID;
 }
 
+/**
+ * @deprecated 3.0
+ */
+function get_user_details( $username ) {
+	_deprecated_function( __FUNCTION__, '3.0', 'get_user_by()' );
+
+	return get_user_by('login', $username);
+}
+
 ?>
\ No newline at end of file
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index 08f97f4569..7ec2cbc12d 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -93,12 +93,6 @@ function get_admin_users_for_domain( $sitedomain = '', $path = '' ) {
 	return false;
 }
 
-// @todo Use get_user_by() and deprecate.
-function get_user_details( $username ) {
-	global $wpdb;
-	return $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->users WHERE user_login = %s", $username) );
-}
-
 function is_main_blog() {
 	global $current_blog, $current_site;
 	if ( $current_blog->domain == $current_site->domain && $current_blog->path == $current_site->path )