diff --git a/mdx/at_aconet/beans.xml b/mdx/at_aconet/beans.xml
index 485d63bc..08960071 100644
--- a/mdx/at_aconet/beans.xml
+++ b/mdx/at_aconet/beans.xml
@@ -66,6 +66,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/au_aaf/beans.xml b/mdx/au_aaf/beans.xml
index e01ad2dc..8ca62637 100644
--- a/mdx/au_aaf/beans.xml
+++ b/mdx/au_aaf/beans.xml
@@ -66,6 +66,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/be_belnet/beans.xml b/mdx/be_belnet/beans.xml
index e4a530ea..9036298a 100644
--- a/mdx/be_belnet/beans.xml
+++ b/mdx/be_belnet/beans.xml
@@ -88,6 +88,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -113,6 +117,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/br_cafe/beans.xml b/mdx/br_cafe/beans.xml
index cc3c8dcb..8e06e21c 100644
--- a/mdx/br_cafe/beans.xml
+++ b/mdx/br_cafe/beans.xml
@@ -87,6 +87,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -112,6 +116,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/ca_caf/beans.xml b/mdx/ca_caf/beans.xml
index 7f237815..4708ab20 100644
--- a/mdx/ca_caf/beans.xml
+++ b/mdx/ca_caf/beans.xml
@@ -78,6 +78,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/ch_switchaai/beans.xml b/mdx/ch_switchaai/beans.xml
index 667ed7b1..4fcad2fe 100644
--- a/mdx/ch_switchaai/beans.xml
+++ b/mdx/ch_switchaai/beans.xml
@@ -108,6 +108,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -133,6 +137,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/common-beans.xml b/mdx/common-beans.xml
index 7a6bf819..bd13a0be 100644
--- a/mdx/common-beans.xml
+++ b/mdx/common-beans.xml
@@ -567,17 +567,6 @@
                 <ref bean="checkSchemas"/>
                 <ref bean="CHECK_imported"/>
                 <ref bean="errorAnnouncingFilter"/>
-                
-                <!--
-                    Strip the namespace used by the entity attribute namespace for now.
-                    This needs to be replaced in the long run by per-channel handling that
-                    lets through those attributes which we have verified that the source
-                    validates in the same way we do, or those which we don't care about.
-                    
-                    This namespace is stripped after the checks to allow for the
-                    entity attributes to be checked before they are discarded.
-                -->
-                <ref bean="stripMdattrNamespace"/>
             </list>
         </property>
     </bean>
diff --git a/mdx/cz_eduid/beans.xml b/mdx/cz_eduid/beans.xml
index b7183522..72b10010 100644
--- a/mdx/cz_eduid/beans.xml
+++ b/mdx/cz_eduid/beans.xml
@@ -107,6 +107,10 @@
                 <ref bean="cz_eduid_stripMetadataNamespace"/>
 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -134,6 +138,10 @@
                 <ref bean="cz_eduid_stripMetadataNamespace"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/de_dfnaai/beans.xml b/mdx/de_dfnaai/beans.xml
index 179bce80..a5504ee6 100644
--- a/mdx/de_dfnaai/beans.xml
+++ b/mdx/de_dfnaai/beans.xml
@@ -88,6 +88,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -113,6 +117,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/dk_wayf/beans.xml b/mdx/dk_wayf/beans.xml
index 01ed1973..1b4b971d 100644
--- a/mdx/dk_wayf/beans.xml
+++ b/mdx/dk_wayf/beans.xml
@@ -73,6 +73,10 @@
                 <ref bean="dk_wayf_spMetadata"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/es_sir/beans.xml b/mdx/es_sir/beans.xml
index 853af867..f397f463 100644
--- a/mdx/es_sir/beans.xml
+++ b/mdx/es_sir/beans.xml
@@ -88,6 +88,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -117,6 +121,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/eu_clarin/beans.xml b/mdx/eu_clarin/beans.xml
index ad1ecdd6..77adc58d 100644
--- a/mdx/eu_clarin/beans.xml
+++ b/mdx/eu_clarin/beans.xml
@@ -49,6 +49,10 @@
                 
                 <ref bean="disassemble"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/fi_haka/beans.xml b/mdx/fi_haka/beans.xml
index 50f06a51..28dbe61f 100644
--- a/mdx/fi_haka/beans.xml
+++ b/mdx/fi_haka/beans.xml
@@ -108,6 +108,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -133,6 +137,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/fr_renater/beans.xml b/mdx/fr_renater/beans.xml
index 98ba93f1..cc04cc1f 100644
--- a/mdx/fr_renater/beans.xml
+++ b/mdx/fr_renater/beans.xml
@@ -79,6 +79,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/gr_grnet/beans.xml b/mdx/gr_grnet/beans.xml
index f3c86d75..84baefb3 100644
--- a/mdx/gr_grnet/beans.xml
+++ b/mdx/gr_grnet/beans.xml
@@ -88,6 +88,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -113,6 +117,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/hr_eduhr/beans.xml b/mdx/hr_eduhr/beans.xml
index 425fdc7c..7f35600f 100644
--- a/mdx/hr_eduhr/beans.xml
+++ b/mdx/hr_eduhr/beans.xml
@@ -118,6 +118,10 @@
                 <ref bean="hr_eduhr_check_regauth"/>
 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/hu_eduid/beans.xml b/mdx/hu_eduid/beans.xml
index 043ee7cb..97a0fab9 100644
--- a/mdx/hu_eduid/beans.xml
+++ b/mdx/hu_eduid/beans.xml
@@ -122,6 +122,10 @@
                 
                 <ref bean="hu_eduid_check_regauth"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -150,6 +154,10 @@
                 
                 <ref bean="hu_eduid_check_regauth"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/ie_edugate/beans.xml b/mdx/ie_edugate/beans.xml
index 71fdb730..b6496379 100644
--- a/mdx/ie_edugate/beans.xml
+++ b/mdx/ie_edugate/beans.xml
@@ -138,6 +138,10 @@
                 
                 <ref bean="ie_edugate_check_regauth"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -165,6 +169,10 @@
                 <ref bean="ie_edugate_default_regauth"/>
                 <ref bean="ie_edugate_check_regauth"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/in_infed/beans.xml b/mdx/in_infed/beans.xml
index a0731f99..2a96df70 100644
--- a/mdx/in_infed/beans.xml
+++ b/mdx/in_infed/beans.xml
@@ -55,6 +55,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/int_edugain/beans.xml b/mdx/int_edugain/beans.xml
index 4bbdcff2..30c06c22 100644
--- a/mdx/int_edugain/beans.xml
+++ b/mdx/int_edugain/beans.xml
@@ -95,6 +95,10 @@
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -130,6 +134,10 @@
                 <ref bean="hu_eduid_stripEntityAttributesNamespace"/>
 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/int_testshib/beans.xml b/mdx/int_testshib/beans.xml
index 32c91423..f123de37 100644
--- a/mdx/int_testshib/beans.xml
+++ b/mdx/int_testshib/beans.xml
@@ -43,6 +43,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/it_idem/beans.xml b/mdx/it_idem/beans.xml
index 185d1d8c..8cd65f64 100644
--- a/mdx/it_idem/beans.xml
+++ b/mdx/it_idem/beans.xml
@@ -88,6 +88,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -113,6 +117,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/jp_gakunin/beans.xml b/mdx/jp_gakunin/beans.xml
index a3daf24c..5d84ecb5 100644
--- a/mdx/jp_gakunin/beans.xml
+++ b/mdx/jp_gakunin/beans.xml
@@ -66,6 +66,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/lv_laife/beans.xml b/mdx/lv_laife/beans.xml
index 87f083a3..6ec64128 100644
--- a/mdx/lv_laife/beans.xml
+++ b/mdx/lv_laife/beans.xml
@@ -46,6 +46,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/nl_surfconext/beans.xml b/mdx/nl_surfconext/beans.xml
index 2e1abc54..c0b0de36 100644
--- a/mdx/nl_surfconext/beans.xml
+++ b/mdx/nl_surfconext/beans.xml
@@ -90,6 +90,10 @@
                 <ref bean="nl_surfconext_spAggregate"/>
                 <ref bean="disassemble"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/nl_surfnet/beans.xml b/mdx/nl_surfnet/beans.xml
index cdfdcb04..a108110b 100644
--- a/mdx/nl_surfnet/beans.xml
+++ b/mdx/nl_surfnet/beans.xml
@@ -101,6 +101,10 @@
                 <ref bean="nl_surfnet_spAggregate"/>
                 <ref bean="disassemble"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -126,6 +130,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/no_feide/beans.xml b/mdx/no_feide/beans.xml
index 731e801c..e2a0279c 100644
--- a/mdx/no_feide/beans.xml
+++ b/mdx/no_feide/beans.xml
@@ -90,6 +90,10 @@
             <list>
                 <ref bean="no_feide_idpMetadata"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -115,6 +119,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/nz_tuakiri/beans.xml b/mdx/nz_tuakiri/beans.xml
index 0bd9309f..2fea3c22 100644
--- a/mdx/nz_tuakiri/beans.xml
+++ b/mdx/nz_tuakiri/beans.xml
@@ -66,6 +66,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/se_swamid/beans.xml b/mdx/se_swamid/beans.xml
index 58022063..9719c971 100644
--- a/mdx/se_swamid/beans.xml
+++ b/mdx/se_swamid/beans.xml
@@ -93,6 +93,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -118,6 +122,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/si_arnes/beans.xml b/mdx/si_arnes/beans.xml
index d4674991..2617f3c8 100644
--- a/mdx/si_arnes/beans.xml
+++ b/mdx/si_arnes/beans.xml
@@ -71,6 +71,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/test/beans.xml b/mdx/test/beans.xml
index 87f9b3d8..3a17dd97 100644
--- a/mdx/test/beans.xml
+++ b/mdx/test/beans.xml
@@ -35,6 +35,10 @@
                 <ref bean="test_aggregate"/>
                 <ref bean="disassemble"/>
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/uk_eduserv/beans.xml b/mdx/uk_eduserv/beans.xml
index 8bbd013b..99b18737 100644
--- a/mdx/uk_eduserv/beans.xml
+++ b/mdx/uk_eduserv/beans.xml
@@ -70,6 +70,10 @@
                 <ref bean="disassemble"/>
                 
                 <ref bean="standardImportActions"/>
+                
+                <!-- Strip all entity attributes from this source. -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
diff --git a/mdx/us_incommon/beans.xml b/mdx/us_incommon/beans.xml
index b72a7d6a..87c1ffd3 100644
--- a/mdx/us_incommon/beans.xml
+++ b/mdx/us_incommon/beans.xml
@@ -115,6 +115,15 @@
                 
                 <ref bean="us_incommon_check_regauth"/>
                 <ref bean="standardImportActions"/>
+
+                <!--
+                    Strip all entity attributes from this source.
+                    
+                    TODO rewrite this so that we preserve things like the
+                    InCommon R+S category membership designation.
+                -->
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>
@@ -162,15 +171,16 @@
                 <ref bean="us_incommon_default_regauth"/>
                 <ref bean="us_incommon_check_regauth"/>
 
+                <ref bean="standardImportActions"/>
+                
                 <!--
-                    Unfortunately in this case, the "standard" import actions will remove all
-                    entity attributes, and we wish to keep some of the InCommon category
-                    designations.
+                    Strip all entity attributes from this source.
                     
-                    TODO This will mean unbundling standardImportActions everywhere
-                    it is currently used.
+                    TODO rewrite this so that we preserve things like the
+                    InCommon R+S category membership designation.
                 -->
-                <ref bean="standardImportActions"/>
+                <ref bean="stripMdattrNamespace"/>
+                
             </list>
         </property>
     </bean>