diff --git a/mods/ra/rules/aircraft.yaml b/mods/ra/rules/aircraft.yaml
index ebaece9713..63f8e40dae 100644
--- a/mods/ra/rules/aircraft.yaml
+++ b/mods/ra/rules/aircraft.yaml
@@ -12,7 +12,6 @@ BADR:
 		Speed: 149
 		Repulsable: False
 		MaximumPitch: 56
-		AirborneUpgrades: airborne
 	Cargo:
 		MaxWeight: 10
 	-Selectable:
@@ -50,7 +49,6 @@ BADR.Bomber:
 		Speed: 149
 		Repulsable: False
 		MaximumPitch: 56
-		AirborneUpgrades: airborne
 	AmmoPool:
 		Ammo: 7
 	-Selectable:
@@ -107,7 +105,6 @@ MIG:
 		Speed: 223
 		RepulsionSpeed: 40
 		MaximumPitch: 56
-		AirborneUpgrades: airborne
 	AutoTarget:
 		TargetWhenIdle: false
 		TargetWhenDamaged: false
@@ -168,7 +165,6 @@ YAK:
 		Speed: 178
 		RepulsionSpeed: 40
 		MaximumPitch: 56
-		AirborneUpgrades: airborne
 	AutoTarget:
 		TargetWhenIdle: false
 		TargetWhenDamaged: false
@@ -216,8 +212,6 @@ TRAN:
 		Speed: 112
 		LandableTerrainTypes: Clear,Rough,Road,Ore,Beach
 		AltitudeVelocity: 0c100
-		AirborneUpgrades: airborne
-		CanHover: True
 	WithSpriteRotorOverlay@PRIMARY:
 		Offset: -597,0,341
 		Sequence: rotor2
@@ -265,8 +259,6 @@ HELI:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 149
-		AirborneUpgrades: airborne
-		CanHover: True
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: HoldFire
@@ -318,8 +310,6 @@ HIND:
 		InitialFacing: 20
 		ROT: 4
 		Speed: 112
-		AirborneUpgrades: airborne
-		CanHover: True
 	AutoTarget:
 		InitialStance: HoldFire
 		InitialStanceAI: HoldFire
@@ -350,7 +340,6 @@ U2:
 		Speed: 373
 		Repulsable: False
 		MaximumPitch: 56
-		AirborneUpgrades: airborne
 	AttackBomber:
 	-Selectable:
 	-Voiced:
diff --git a/mods/ra/rules/defaults.yaml b/mods/ra/rules/defaults.yaml
index dee3ecf8bb..1a9b053632 100644
--- a/mods/ra/rules/defaults.yaml
+++ b/mods/ra/rules/defaults.yaml
@@ -353,6 +353,7 @@
 	Aircraft:
 		RepairBuildings: fix
 		RearmBuildings: afld
+		AirborneUpgrades: airborne
 	Targetable@GROUND:
 		TargetTypes: Ground, Repair, Vehicle
 		UpgradeTypes: airborne
@@ -393,6 +394,7 @@
 		GenericName: Helicopter
 	Aircraft:
 		RearmBuildings: hpad
+		CanHover: True
 	GpsDot:
 		String: Helicopter
 	Hovers:
@@ -617,6 +619,8 @@
 	WithShadow:
 	Tooltip:
 		GenericName: Destroyed Plane
+	Aircraft:
+		AirborneUpgrades: airborne
 	FallsToEarth:
 		Spins: False
 		Moves: True
@@ -627,6 +631,9 @@
 	WithShadow:
 	Tooltip:
 		GenericName: Destroyed Helicopter
+	Aircraft:
+		AirborneUpgrades: airborne
+		CanHover: True
 	FallsToEarth:
 
 ^Bridge:
diff --git a/mods/ra/rules/husks.yaml b/mods/ra/rules/husks.yaml
index 4cba2652b7..f34f4a1eb7 100644
--- a/mods/ra/rules/husks.yaml
+++ b/mods/ra/rules/husks.yaml
@@ -88,8 +88,6 @@ TRAN.Husk:
 	Aircraft:
 		ROT: 4
 		Speed: 149
-		AirborneUpgrades: airborne
-		CanHover: True
 	WithSpriteRotorOverlay@PRIMARY:
 		Offset: -597,0,341
 	WithSpriteRotorOverlay@SECONDARY:
@@ -121,7 +119,6 @@ BADR.Husk:
 	Aircraft:
 		ROT: 5
 		Speed: 149
-		AirborneUpgrades: airborne
 	SmokeTrailWhenDamaged@0:
 		Offset: -432,560,0
 		Interval: 2
@@ -144,7 +141,6 @@ MIG.Husk:
 	Aircraft:
 		ROT: 5
 		Speed: 186
-		AirborneUpgrades: airborne
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,171
 		Interval: 2
@@ -164,7 +160,6 @@ YAK.Husk:
 	Aircraft:
 		ROT: 5
 		Speed: 149
-		AirborneUpgrades: airborne
 	SmokeTrailWhenDamaged:
 		Offset: -853,0,0
 		Interval: 2
@@ -182,8 +177,6 @@ HELI.Husk:
 	Aircraft:
 		ROT: 4
 		Speed: 149
-		AirborneUpgrades: airborne
-		CanHover: True
 	WithSpriteRotorOverlay:
 		Offset: 0,0,85
 	SmokeTrailWhenDamaged:
@@ -202,8 +195,6 @@ HIND.Husk:
 	Aircraft:
 		ROT: 4
 		Speed: 112
-		AirborneUpgrades: airborne
-		CanHover: True
 	WithSpriteRotorOverlay:
 	SmokeTrailWhenDamaged:
 		Offset: -427,0,0
@@ -219,7 +210,6 @@ U2.Husk:
 	Aircraft:
 		ROT: 7
 		Speed: 373
-		AirborneUpgrades: airborne
 	Contrail@1:
 		Offset: -725,683,0
 	Contrail@2: