diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php
index 5e9599eb8..0943ff955 100644
--- a/wp-admin/includes/schema.php
+++ b/wp-admin/includes/schema.php
@@ -667,7 +667,7 @@ function populate_network( $network_id = 1, $domain = '', $email = '', $site_nam
 
 	if ( !is_multisite() ) {
 		$site_admins = array( $site_user->user_login );
-		$users = get_users_of_blog();
+		$users = get_users();
 		if ( $users ) {
 			foreach ( $users as $user ) {
 				if ( is_super_admin( $user->ID ) && !in_array( $user->user_login, $site_admins ) )
diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index bc44349f8..278e9407d 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -281,7 +281,7 @@ function wp_list_authors($args = '') {
 	$return = '';
 
 	/** @todo Move select to get_authors(). */
-	$users = get_users_of_blog();
+	$users = get_users();
 	$author_ids = array();
 	foreach ( (array) $users as $user )
 		$author_ids[] = $user->user_id;
diff --git a/wp-includes/user.php b/wp-includes/user.php
index cdfefd3a9..605be5b4b 100644
--- a/wp-includes/user.php
+++ b/wp-includes/user.php
@@ -572,7 +572,7 @@ function get_users( $args ) {
  * @return array List of users that are part of that Blog ID
  */
 function get_users_of_blog( $id = '' ) {
-	global $wpdb, $blog_id;
+	global $blog_id;
 
 	if ( empty($id) )
 		$id = (int) $blog_id;
diff --git a/xmlrpc.php b/xmlrpc.php
index be7b531de..7f0de0432 100644
--- a/xmlrpc.php
+++ b/xmlrpc.php
@@ -834,15 +834,15 @@ class wp_xmlrpc_server extends IXR_Server {
 		do_action('xmlrpc_call', 'wp.getAuthors');
 
 		$authors = array();
-		foreach ( (array) get_users_of_blog() as $row ) {
+		foreach ( get_users() as $user_id => $user_object ) {
 			$authors[] = array(
-				"user_id"       => $row->user_id,
-				"user_login"    => $row->user_login,
-				"display_name"  => $row->display_name
+				"user_id"       => $user_id,
+				"user_login"    => $user_object->user_login,
+				"display_name"  => $user_object->display_name
 			);
 		}
 
-		return($authors);
+		return $authors;
 	}
 
 	/**