Index: wp-admin/ms-upgrade-site.php
===================================================================
--- wp-admin/ms-upgrade-site.php	(revision 12905)
+++ wp-admin/ms-upgrade-site.php	(working copy)
@@ -33,8 +33,7 @@
 			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 ) )
Index: wp-includes/ms-functions.php
===================================================================
--- wp-includes/ms-functions.php	(revision 12905)
+++ wp-includes/ms-functions.php	(working copy)
@@ -275,7 +275,7 @@
 		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 );