diff --git a/lib/Target/X86/AsmParser/X86AsmParser.cpp b/lib/Target/X86/AsmParser/X86AsmParser.cpp
index aaa1c0620ba..6b403c10a1e 100644
--- a/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -683,11 +683,6 @@ X86ATTAsmParser::MatchInstruction(const SmallVectorImpl<MCParsedAsmOperand*>
   if (MatchB + MatchW + MatchL == 2)
     return false;
 
-  // Similarly, if all three matched then we assume this is a generic operation
-  // involving memory, and take the 'l' form (to match 'gas').
-  if (MatchB + MatchW + MatchL == 0)
-    return false;
-
   // Otherwise, the match failed.
   return true;
 }
diff --git a/test/MC/AsmParser/X86/x86_64-suffix-matching.s b/test/MC/AsmParser/X86/x86_64-suffix-matching.s
index 9a38e1bb06e..c4f0be2c6ea 100644
--- a/test/MC/AsmParser/X86/x86_64-suffix-matching.s
+++ b/test/MC/AsmParser/X86/x86_64-suffix-matching.s
@@ -4,5 +4,3 @@
         add $0, %eax
 // CHECK: addb $255, %al
         add $0xFF, %al
-// CHECK: addl $0, (%rax)
-        add $0, 0(%rax)