diff --git a/lib/Target/Mips/MipsAsmPrinter.cpp b/lib/Target/Mips/MipsAsmPrinter.cpp
index 3ed6c55..8cc645f 100644
--- a/lib/Target/Mips/MipsAsmPrinter.cpp
+++ b/lib/Target/Mips/MipsAsmPrinter.cpp
@@ -200,7 +200,8 @@ void MipsAsmPrinter::EmitFunctionEntryLabel() {
       OutStreamer.EmitRawText(StringRef("\t.set\tmips16"));
     else
       OutStreamer.EmitRawText(StringRef("\t.set\tnomips16"));
-    OutStreamer.EmitRawText(StringRef("\t.set\tnomicromips"));
+    // leave out until FSF available gas has micromips changes
+    // OutStreamer.EmitRawText(StringRef("\t.set\tnomicromips"));
     OutStreamer.EmitRawText("\t.ent\t" + Twine(CurrentFnSym->getName()));
   }
   OutStreamer.EmitLabel(CurrentFnSym);
diff --git a/test/CodeGen/Mips/null.ll b/test/CodeGen/Mips/null.ll
index f34f6a4..7beae99 100644
--- a/test/CodeGen/Mips/null.ll
+++ b/test/CodeGen/Mips/null.ll
@@ -6,7 +6,7 @@ entry:
   ret i32 0
 
 ; 16: 	.set	mips16                  # @main
-; 16:	.set	nomicromips
+
 
 ; 16:	jr	$ra
 
