diff --git a/wp-content/blogs.php b/wp-content/blogs.php
index cde2e5e3a..28ad27211 100644
--- a/wp-content/blogs.php
+++ b/wp-content/blogs.php
@@ -8,8 +8,6 @@
   
 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' );
diff --git a/wp-includes/ms-files.php b/wp-includes/ms-files.php
index 03c16c0cf..ecec87c18 100644
--- a/wp-includes/ms-files.php
+++ b/wp-includes/ms-files.php
@@ -15,6 +15,8 @@ if ( ! defined( 'SHORTINIT' ) ) {
 
 ms_default_constants( 'ms-files' );
 
+error_reporting( 0 );
+
 if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
 	status_header( 404 );
 	die( '404 &#8212; File not found.' );