diff --git a/src/Compilers/Core/Portable/MetadataReference/ModuleMetadata.cs b/src/Compilers/Core/Portable/MetadataReference/ModuleMetadata.cs
index 58d64292d8f73..ab9a5f805e3dd 100644
--- a/src/Compilers/Core/Portable/MetadataReference/ModuleMetadata.cs
+++ b/src/Compilers/Core/Portable/MetadataReference/ModuleMetadata.cs
@@ -240,13 +240,6 @@ public static ModuleMetadata CreateFromStream(Stream peStream, PEStreamOptions o
                 }
             }
 
-            // Workaround of issue https://github.com/dotnet/corefx/issues/1815: 
-            if (peStream.Length == 0 && (options & PEStreamOptions.PrefetchEntireImage) != 0 && (options & PEStreamOptions.PrefetchMetadata) != 0)
-            {
-                // throws BadImageFormatException:
-                new PEHeaders(peStream);
-            }
-
             // ownership of the stream is passed on PEReader:
             return new ModuleMetadata(new PEReader(peStream, options), onDispose: null);
         }