diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
index 1346c54b40..67919c0759 100644
--- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
+++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs
@@ -31,9 +31,9 @@ namespace OpenRA.Mods.Common.Traits
 		public readonly int RepulsionSpeed = -1;
 
 		[ActorReference]
-		public readonly HashSet<string> RepairBuildings = new HashSet<string> { "fix" };
+		public readonly HashSet<string> RepairBuildings = new HashSet<string> { };
 		[ActorReference]
-		public readonly HashSet<string> RearmBuildings = new HashSet<string> { "hpad", "afld" };
+		public readonly HashSet<string> RearmBuildings = new HashSet<string> { };
 		public readonly int InitialFacing = 0;
 		public readonly int ROT = 255;
 		public readonly int Speed = 1;
diff --git a/mods/cnc/rules/defaults.yaml b/mods/cnc/rules/defaults.yaml
index 730b5e2e8c..b8c216af15 100644
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -134,7 +134,6 @@
 		Bounds: 24,24
 	Aircraft:
 		RepairBuildings: hpad
-		RearmBuildings:
 		LandWhenIdle: false
 		AirborneUpgrades: airborne
 		CanHover: True
diff --git a/mods/d2k/rules/aircraft.yaml b/mods/d2k/rules/aircraft.yaml
index 8fd642d08b..2120cf4845 100644
--- a/mods/d2k/rules/aircraft.yaml
+++ b/mods/d2k/rules/aircraft.yaml
@@ -18,7 +18,6 @@ carryall.reinforce:
 		Speed: 144 # 112 * ~1.3 for balance reasons
 		LandableTerrainTypes: Sand, Rock, Transition, Spice, SpiceSand, Dune
 		RepairBuildings: repair_pad
-		RearmBuildings:
 		Repulsable: False
 		LandAltitude: 100
 		LandWhenIdle: False
@@ -61,8 +60,6 @@ frigate:
 	Aircraft:
 		ROT: 1
 		Speed: 189 # 126 * ~1.5 for balance reasons
-		RepairBuildings:
-		RearmBuildings:
 		Repulsable: False
 		MaximumPitch: 20
 	-AppearsOnRadar:
@@ -85,8 +82,6 @@ ornithopter:
 	Aircraft:
 		ROT: 2
 		Speed: 224 # 189 * ~1.2 for balance reasons
-		RepairBuildings:
-		RearmBuildings:
 		Repulsable: False
 		CanHover: True
 	AmmoPool:
@@ -104,8 +99,6 @@ ornithopter.husk:
 	Aircraft:
 		ROT: 5
 		Speed: 224
-		RepairBuildings:
-		RearmBuildings:
 	RenderSprites:
 		Image: ornithopter
 
@@ -116,8 +109,6 @@ carryall.husk:
 	Aircraft:
 		ROT: 4
 		Speed: 144
-		RepairBuildings:
-		RearmBuildings:
 		CanHover: True
 	RenderSprites:
 		Image: carryall
diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
index 028152b3d9..ebaece9713 100644
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -105,7 +105,6 @@ MIG:
 		InitialFacing: 192
 		ROT: 4
 		Speed: 223
-		RearmBuildings: afld
 		RepulsionSpeed: 40
 		MaximumPitch: 56
 		AirborneUpgrades: airborne
@@ -164,7 +163,6 @@ YAK:
 		FacingTolerance: 20
 	Aircraft:
 		CruiseAltitude: 2560
-		RearmBuildings: afld
 		InitialFacing: 192
 		ROT: 4
 		Speed: 178
@@ -213,7 +211,6 @@ TRAN:
 		Range: 10c0
 		Type: CenterPosition
 	Aircraft:
-		RearmBuildings: hpad
 		InitialFacing: 0
 		ROT: 5
 		Speed: 112
@@ -264,7 +261,6 @@ HELI:
 	AttackHeli:
 		FacingTolerance: 20
 	Aircraft:
-		RearmBuildings: hpad
 		LandWhenIdle: false
 		InitialFacing: 20
 		ROT: 4
@@ -318,7 +314,6 @@ HIND:
 	AttackHeli:
 		FacingTolerance: 20
 	Aircraft:
-		RearmBuildings: hpad
 		LandWhenIdle: false
 		InitialFacing: 20
 		ROT: 4
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index d7429a5afb..dee3ecf8bb 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -350,6 +350,9 @@
 	SelectionDecorations:
 	Selectable:
 		Bounds: 24,24
+	Aircraft:
+		RepairBuildings: fix
+		RearmBuildings: afld
 	Targetable@GROUND:
 		TargetTypes: Ground, Repair, Vehicle
 		UpgradeTypes: airborne
@@ -388,6 +391,8 @@
 	Inherits: ^Plane
 	Tooltip:
 		GenericName: Helicopter
+	Aircraft:
+		RearmBuildings: hpad
 	GpsDot:
 		String: Helicopter
 	Hovers:
diff --git a/mods/ts/rules/aircraft.yaml b/mods/ts/rules/aircraft.yaml
index 1e2ea35af9..d4e1e8c950 100644
--- a/mods/ts/rules/aircraft.yaml
+++ b/mods/ts/rules/aircraft.yaml
@@ -75,7 +75,6 @@ ORCA:
 	Selectable:
 		Bounds: 30,24
 	Aircraft:
-		RearmBuildings: gahpad, nahpad
 		ROT: 5
 		Speed: 186
 		TakeoffSound: orcaup1.aud
@@ -275,7 +274,6 @@ APACHE:
 	Selectable:
 		Bounds: 30,24
 	Aircraft:
-		RearmBuildings: gahpad, nahpad
 		ROT: 5
 		Speed: 130
 	Health:
@@ -319,8 +317,6 @@ HUNTER:
 		Weapon: SuicideBomb
 		EmptyWeapon: SuicideBomb
 	Aircraft:
-		RearmBuildings:
-		RepairBuildings:
 		ROT: 16
 		Speed: 355
 		CruiseAltitude: 256
diff --git a/mods/ts/rules/defaults.yaml b/mods/ts/rules/defaults.yaml
index 56f133871e..e6037d6b2a 100644
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -497,7 +497,7 @@
 	Inherits: ^Aircraft
 	Aircraft:
 		RepairBuildings: gadept
-		RearmBuildings:
+		RearmBuildings: gahpad, nahpad
 		LandWhenIdle: no
 		CruiseAltitude: 2048
 		Voice: Move