diff --git a/wp-admin/ms-upgrade-site.php b/wp-admin/ms-upgrade-site.php
index 265b504eea..fb7c9c363b 100644
--- a/wp-admin/ms-upgrade-site.php
+++ b/wp-admin/ms-upgrade-site.php
@@ -33,8 +33,7 @@ switch ( $action ) {
 			echo "<ul>";
 			foreach ( (array) $blogs as $details ) {
 				if ( $details['spam'] == 0 && $details['deleted'] == 0 && $details['archived'] == 0 ) {
-					$blog_prefix = $wpdb->get_blog_prefix( $details[ 'blog_id' ] );
-					$siteurl = $wpdb->get_var( "SELECT option_value from {$blog_prefix}options WHERE option_name = 'siteurl'" );
+					$siteurl = get_blog_option( $details['blog_id'], 'siteurl' );
 					echo "<li>$siteurl</li>";
 					$response = wp_remote_get( trailingslashit( $siteurl ) . "wp-admin/upgrade.php?step=1", array( 'timeout' => 120, 'httpversion' => '1.1' ) );
 					if ( is_wp_error( $response ) )
diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php
index f4cf3fa1aa..4c90fc56f8 100644
--- a/wp-includes/ms-functions.php
+++ b/wp-includes/ms-functions.php
@@ -272,7 +272,7 @@ function get_blog_option( $blog_id, $setting, $default = false ) {
 		return get_blog_option( $blog_id, 'siteurl' );
 
 	if ( 'siteurl' == $setting || 'home' == $setting || 'category_base' == $setting )
-		$value = preg_replace( '|/+$|', '', $value );
+		$value = untrailingslashit( $value );
 
 	if (! @unserialize( $value ) )
 		$value = stripslashes( $value );