diff --git a/mdx/incommon/mdq-all-cloudhsm.xml b/mdx/incommon/mdq-all-cloudhsm.xml
index e54e711a..2ddcb105 100644
--- a/mdx/incommon/mdq-all-cloudhsm.xml
+++ b/mdx/incommon/mdq-all-cloudhsm.xml
@@ -19,18 +19,18 @@
     <!-- Import mdq-all beans -->
     <import resource="classpath:incommon/mdq-all.xml" />
 
-    <!-- This bean MUST be called "conversionService" to work properly -->
-    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
-            </set>
-        </property>
-    </bean>
+<!--     This bean MUST be called "conversionService" to work properly -->
+<!--     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"> -->
+<!--         <property name="converters"> -->
+<!--             <set> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" /> -->
+<!--             </set> -->
+<!--         </property> -->
+<!--     </bean> -->
 
     <bean id="privateKeyFactory" class="uk.org.iay.incommon.mda.cloudhsm.CaviumPrivateKeyFactoryBean"
         p:username="${sign.keyUser}" p:password="${sign.keyPassword}" p:keyHandle="${sign.keyHandle}" />
diff --git a/mdx/incommon/mdq-all-localkey.xml b/mdx/incommon/mdq-all-localkey.xml
index d329dc75..f9a87501 100644
--- a/mdx/incommon/mdq-all-localkey.xml
+++ b/mdx/incommon/mdq-all-localkey.xml
@@ -19,18 +19,18 @@
     <!-- Import mdq-all beans -->
     <import resource="classpath:incommon/mdq-all.xml" />
 
-    <!-- This bean MUST be called "conversionService" to work properly -->
-    <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean">
-        <property name="converters">
-            <set>
-                <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" />
-                <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" />
-                <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" />
-            </set>
-        </property>
-    </bean>
+<!--     This bean MUST be called "conversionService" to work properly -->
+<!--     <bean id="conversionService" class="org.springframework.context.support.ConversionServiceFactoryBean"> -->
+<!--         <property name="converters"> -->
+<!--             <set> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.DurationToLongConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.StringToIPRangeConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.BooleanToPredicateConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.StringBooleanToPredicateConverter" /> -->
+<!--                 <bean class="net.shibboleth.ext.spring.config.StringToResourceConverter" /> -->
+<!--             </set> -->
+<!--         </property> -->
+<!--     </bean> -->
 
     <bean id="privateKeyFactory" parent="PrivateKeyFactoryBean" p:resource="${sign.keyResource}"
         p:privateKeyPassword="${sign.keyPassword}" />