diff --git a/includes/file.inc b/includes/file.inc
index c5e5cf07d636d2454c3e158eda0e2c0f6f7297fa..971a01983a3956710f0e3c27171ffb41c4735fa2 100644
--- a/includes/file.inc
+++ b/includes/file.inc
@@ -2489,7 +2489,7 @@ function file_get_content_headers($file) {
   }
 
   return array(
-    'Content-Type' => $type . '; name="' . $name . '"',
+    'Content-Type' => $type,
     'Content-Length' => $file->filesize,
     'Content-Disposition' => $disposition . '; filename="' . $name . '"',
     'Cache-Control' => 'private',
diff --git a/modules/image/image.test b/modules/image/image.test
index 6a5d20f20768da0dba935db31a39b2d8b82848d0..2a3559981d1b77d0a6ced55fbdbccede63e15c40 100644
--- a/modules/image/image.test
+++ b/modules/image/image.test
@@ -748,7 +748,7 @@ class ImageFieldDisplayTestCase extends ImageFieldTestCase {
     if ($scheme == 'private') {
       // Only verify HTTP headers when using private scheme and the headers are
       // sent by Drupal.
-      $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png; name="' . $test_image->filename . '"', t('Content-Type header was sent.'));
+      $this->assertEqual($this->drupalGetHeader('Content-Type'), 'image/png', t('Content-Type header was sent.'));
       $this->assertEqual($this->drupalGetHeader('Content-Disposition'), 'inline; filename="' . $test_image->filename . '"', t('Content-Disposition header was sent.'));
       $this->assertEqual($this->drupalGetHeader('Cache-Control'), 'private', t('Cache-Control header was sent.'));