Index: wp-admin/network/upgrade.php
===================================================================
--- wp-admin/network/upgrade.php	(revision 34656)
+++ wp-admin/network/upgrade.php	(working copy)
@@ -63,8 +63,8 @@
 		echo "<ul>";
 		foreach ( (array) $blogs as $details ) {
 			switch_to_blog( $details['blog_id'] );
-			$siteurl = site_url();
-			$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db' );
+			$siteurl = site_url( '', 'original' );
+			$upgrade_url = admin_url( 'upgrade.php?step=upgrade_db', 'original' );
 			restore_current_blog();
 
 			echo "<li>$siteurl</li>";
Index: wp-includes/link-template.php
===================================================================
--- wp-includes/link-template.php	(revision 34656)
+++ wp-includes/link-template.php	(working copy)
@@ -3335,10 +3335,14 @@
  * @since 3.4.0
  *
  * @param string $url    Absolute url that includes a scheme
- * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', or 'relative'.
+ * @param string $scheme Optional. Scheme to give $url. Currently 'http', 'https', 'login', 'login_post', 'admin', 'relative' or 'original'.
  * @return string $url URL with chosen scheme.
  */
 function set_url_scheme( $url, $scheme = null ) {
+	if ( 'original' === $scheme ) {
+		return $url;
+	}
+
 	$orig_scheme = $scheme;
 
 	if ( ! $scheme ) {