diff --git a/llvm/lib/Target/ARM/ARMInstrInfo.td b/llvm/lib/Target/ARM/ARMInstrInfo.td
index 52bd9cb5d4005cb350312d55ffdc61f002090830..f163c1b1bbb1174b0484b484d062648c5d22ebe8 100644
--- a/llvm/lib/Target/ARM/ARMInstrInfo.td
+++ b/llvm/lib/Target/ARM/ARMInstrInfo.td
@@ -1803,7 +1803,8 @@ multiclass arm_ldst_mult<string asm, bit L_bit, Format f,
   }
 } 
 
-let neverHasSideEffects = 1, isCodeGenOnly = 1 in {
+/* TODO:
+let neverHasSideEffects = 1 in {
 
 let mayLoad = 1, hasExtraDefRegAllocReq = 1 in
 defm LDM : arm_ldst_mult<"ldm", 1, LdStMulFrm, IIC_iLoad_m, IIC_iLoad_mu>;
@@ -1812,6 +1813,7 @@ let mayStore = 1, hasExtraSrcRegAllocReq = 1 in
 defm STM : arm_ldst_mult<"stm", 0, LdStMulFrm, IIC_iStore_m, IIC_iStore_mu>;
 
 } // neverHasSideEffects
+*/
 
 let mayLoad = 1, neverHasSideEffects = 1, hasExtraDefRegAllocReq = 1,
     isCodeGenOnly = 1 in {
diff --git a/llvm/lib/Target/ARM/ARMInstrThumb.td b/llvm/lib/Target/ARM/ARMInstrThumb.td
index 4064ced1fc0d2ac8c847435827072457739c73f8..2d387bb394978c23f7e3a81e0798820e729c7c93 100644
--- a/llvm/lib/Target/ARM/ARMInstrThumb.td
+++ b/llvm/lib/Target/ARM/ARMInstrThumb.td
@@ -549,7 +549,7 @@ multiclass thumb_ldst_mult<string asm, InstrItinClass itin,
         T1Encoding<T1Enc>;
 }
 
-/* FIXME: Uncommented, this causes a decoding conflict.
+/* TODO: Uncommented, this causes a decoding conflict.
 let neverHasSideEffects = 1 in {
 
 let mayLoad = 1, hasExtraDefRegAllocReq = 1 in
diff --git a/llvm/lib/Target/ARM/ARMInstrThumb2.td b/llvm/lib/Target/ARM/ARMInstrThumb2.td
index e850d3fb902dea54055101d777f0dc1203b76301..62229c33b6de6da3eeba5a8f88a4fa9050ccd8c8 100644
--- a/llvm/lib/Target/ARM/ARMInstrThumb2.td
+++ b/llvm/lib/Target/ARM/ARMInstrThumb2.td
@@ -1347,7 +1347,8 @@ multiclass thumb2_ldst_mult<string asm, InstrItinClass itin,
   }
 }
 
-let neverHasSideEffects = 1, isCodeGenOnly = 1 in {
+/* TODO:
+let neverHasSideEffects = 1 in {
 
 let mayLoad = 1, hasExtraDefRegAllocReq = 1 in
 defm t2LDM : thumb2_ldst_mult<"ldm", IIC_iLoad_m, IIC_iLoad_mu, 1>;
@@ -1356,6 +1357,7 @@ let mayStore = 1, hasExtraSrcRegAllocReq = 1 in
 defm t2STM : thumb2_ldst_mult<"stm", IIC_iStore_m, IIC_iStore_mu, 0>;
 
 } // neverHasSideEffects
+*/
 
 let mayLoad = 1, neverHasSideEffects = 1, hasExtraDefRegAllocReq = 1,
     isCodeGenOnly = 1 in {