Index: wp-content/blogs.php
===================================================================
--- wp-content/blogs.php	(revision 13038)
+++ wp-content/blogs.php	(working copy)
@@ -5,13 +5,8 @@
  * @package WordPress
  * @subpackage Multisite
  */
-  
-define( 'SHORTINIT', true );
-require_once( dirname( dirname( __FILE__) ) . '/wp-load.php' );
-/* l10n is not loaded on SHORTINIT */  
-_deprecated_file( basename( __FILE__ ), '3.0', null, sprintf( 'Change your rewrite rules to use <code>%1$s</code> instead of <code>%2$s</code>.', 'wp-includes/ms-files.php', 'wp-content/blogs.php' ) );
-  
+
 /** Load Multisite upload handler. */
 require_once( ABSPATH . WPINC . '/ms-files.php' );
-  
+
 ?>
Index: wp-includes/ms-files.php
===================================================================
--- wp-includes/ms-files.php	(revision 13038)
+++ wp-includes/ms-files.php	(working copy)
@@ -8,11 +8,12 @@
  * @subpackage Multisite
  */
 
-if ( ! defined( 'SHORTINIT' ) ) {
-	define( 'SHORTINIT', true );
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
-}
 
+define( 'SHORTINIT', true );
+require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+
+error_reporting(0);
+
 ms_default_constants( 'ms-files' );
 
 if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {