diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index 51973eb87fb..a4488ae05ab 100644
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -3079,7 +3079,7 @@ std::error_code BitcodeReader::parseModule(bool Resume,
 
 std::error_code BitcodeReader::parseBitcodeInto(Module *M,
                                                 bool ShouldLazyLoadMetadata) {
-  TheModule = nullptr;
+  TheModule = M;
 
   if (std::error_code EC = initStream())
     return EC;
@@ -3097,8 +3097,6 @@ std::error_code BitcodeReader::parseBitcodeInto(Module *M,
   // need to understand them all.
   while (1) {
     if (Stream.AtEndOfStream()) {
-      if (TheModule)
-        return std::error_code();
       // We didn't really read a proper Module.
       return error("Malformed IR file");
     }
@@ -3106,47 +3104,14 @@ std::error_code BitcodeReader::parseBitcodeInto(Module *M,
     BitstreamEntry Entry =
       Stream.advance(BitstreamCursor::AF_DontAutoprocessAbbrevs);
 
-    switch (Entry.Kind) {
-    case BitstreamEntry::Error:
+    if (Entry.Kind != BitstreamEntry::SubBlock)
       return error("Malformed block");
-    case BitstreamEntry::EndBlock:
-      return std::error_code();
 
-    case BitstreamEntry::SubBlock:
-      switch (Entry.ID) {
-      case bitc::BLOCKINFO_BLOCK_ID:
-        if (Stream.ReadBlockInfoBlock())
-          return error("Malformed block");
-        break;
-      case bitc::MODULE_BLOCK_ID:
-        // Reject multiple MODULE_BLOCK's in a single bitstream.
-        if (TheModule)
-          return error("Invalid multiple blocks");
-        TheModule = M;
-        if (std::error_code EC = parseModule(false, ShouldLazyLoadMetadata))
-          return EC;
-        if (Streamer)
-          return std::error_code();
-        break;
-      default:
-        if (Stream.SkipBlock())
-          return error("Invalid record");
-        break;
-      }
-      continue;
-    case BitstreamEntry::Record:
-      // There should be no records in the top-level of blocks.
-
-      // The ranlib in Xcode 4 will align archive members by appending newlines
-      // to the end of them. If this file size is a multiple of 4 but not 8, we
-      // have to read and ignore these final 4 bytes :-(
-      if (Stream.getAbbrevIDWidth() == 2 && Entry.ID == 2 &&
-          Stream.Read(6) == 2 && Stream.Read(24) == 0xa0a0a &&
-          Stream.AtEndOfStream())
-        return std::error_code();
+    if (Entry.ID == bitc::MODULE_BLOCK_ID)
+      return parseModule(false, ShouldLazyLoadMetadata);
 
+    if (Stream.SkipBlock())
       return error("Invalid record");
-    }
   }
 }
 
diff --git a/test/Bitcode/Inputs/padding-garbage.bc b/test/Bitcode/Inputs/padding-garbage.bc
new file mode 100644
index 00000000000..b44b584f4dc
Binary files /dev/null and b/test/Bitcode/Inputs/padding-garbage.bc differ
diff --git a/test/Bitcode/padding.test b/test/Bitcode/padding.test
index 72fe42ea47e..63b2fec2b59 100644
--- a/test/Bitcode/padding.test
+++ b/test/Bitcode/padding.test
@@ -1,7 +1,7 @@
 Test that both llvm-dis (uses a data streamer) and opt (no data streamer)
-handle a .bc file padded with '\n' at the end.
+handle a .bc file with any padding.
 
-This files can be produced under a peculiar situation:
+A file padded with '\n' can be produced under a peculiar situation:
 
 * A .bc is produced os OS X, but without a darwin triple, so it has no
   wrapper.
@@ -9,5 +9,10 @@ This files can be produced under a peculiar situation:
 * ranlib is ran on that archive. It will pad the members to make them multiple
   of 8 bytes.
 
+and there is no reason to not handle the general case.
+
 RUN: llvm-dis -disable-output %p/Inputs/padding.bc
 RUN: opt -disable-output %p/Inputs/padding.bc
+
+RUN: llvm-dis -disable-output %p/Inputs/padding-garbage.bc
+RUN: opt -disable-output %p/Inputs/padding-garbage.bc