Index: template_unit_cavalry_melee_axeman.xml
===================================================================
--- template_unit_cavalry_melee_axeman.xml
+++ template_unit_cavalry_melee_axeman.xml
@@ -31,7 +31,4 @@
     <wood>4</wood>
     <metal>1</metal>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: template_unit_cavalry_melee_spearman.xml
===================================================================
--- template_unit_cavalry_melee_spearman.xml
+++ template_unit_cavalry_melee_spearman.xml
@@ -38,7 +38,4 @@
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: template_unit_cavalry_melee_swordsman.xml
===================================================================
--- template_unit_cavalry_melee_swordsman.xml
+++ template_unit_cavalry_melee_swordsman.xml
@@ -31,7 +31,4 @@
     <wood>4</wood>
     <metal>1</metal>
   </Loot>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: template_unit_cavalry_ranged_archer.xml
===================================================================
--- template_unit_cavalry_ranged_archer.xml
+++ template_unit_cavalry_ranged_archer.xml
@@ -28,4 +28,7 @@
     <VisibleClasses datatype="tokens">Archer</VisibleClasses>
     <GenericName>Cavalry Archer</GenericName>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.09</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_cavalry_ranged_javelineer.xml
===================================================================
--- template_unit_cavalry_ranged_javelineer.xml
+++ template_unit_cavalry_ranged_javelineer.xml
@@ -34,4 +34,7 @@
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.09</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_champion_cavalry_archer.xml
===================================================================
--- template_unit_champion_cavalry_archer.xml
+++ template_unit_champion_cavalry_archer.xml
@@ -34,4 +34,7 @@
       <death>actor/fauna/death/death_horse.xml</death>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.09</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_champion_cavalry_axeman.xml
===================================================================
--- template_unit_champion_cavalry_axeman.xml
+++ template_unit_champion_cavalry_axeman.xml
@@ -23,7 +23,4 @@
     <VisibleClasses datatype="tokens">Melee Axeman</VisibleClasses>
     <GenericName>Champion Cavalry Axeman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: template_unit_champion_cavalry_javelineer.xml
===================================================================
--- template_unit_champion_cavalry_javelineer.xml
+++ template_unit_champion_cavalry_javelineer.xml
@@ -36,4 +36,7 @@
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.09</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_champion_cavalry_spearman.xml
===================================================================
--- template_unit_champion_cavalry_spearman.xml
+++ template_unit_champion_cavalry_spearman.xml
@@ -36,7 +36,4 @@
       <attack_melee>attack/weapon/spear_attack.xml</attack_melee>
     </SoundGroups>
   </Sound>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.1</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: template_unit_champion_cavalry_swordsman.xml
===================================================================
--- template_unit_champion_cavalry_swordsman.xml
+++ template_unit_champion_cavalry_swordsman.xml
@@ -24,7 +24,4 @@
     <VisibleClasses datatype="tokens">Melee Swordsman</VisibleClasses>
     <GenericName>Champion Cavalry Swordsman</GenericName>
   </Identity>
-  <UnitMotion>
-    <WalkSpeed op="mul">1.2</WalkSpeed>
-  </UnitMotion>
 </Entity>
Index: template_unit_hero_cavalry_archer.xml
===================================================================
--- template_unit_hero_cavalry_archer.xml
+++ template_unit_hero_cavalry_archer.xml
@@ -29,4 +29,7 @@
       special/formations/skirmish
     </Formations>
   </Identity>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.09</WalkSpeed>
+  </UnitMotion>
 </Entity>
Index: template_unit_hero_cavalry_javelineer.xml
===================================================================
--- template_unit_hero_cavalry_javelineer.xml
+++ template_unit_hero_cavalry_javelineer.xml
@@ -38,4 +38,7 @@
       <attack_impact_ranged>attack/impact/javelin_impact.xml</attack_impact_ranged>
     </SoundGroups>
   </Sound>
+  <UnitMotion>
+    <WalkSpeed op="mul">1.09</WalkSpeed>
+  </UnitMotion>
 </Entity>