diff --git a/OpenRa.Game/Traits/Activities/HeliReturn.cs b/OpenRa.Game/Traits/Activities/HeliReturn.cs
index 425f8cb997..52d4c12f47 100644
--- a/OpenRa.Game/Traits/Activities/HeliReturn.cs
+++ b/OpenRa.Game/Traits/Activities/HeliReturn.cs
@@ -24,7 +24,7 @@ namespace OpenRa.Game.Traits.Activities
 			if (isCanceled) return NextActivity;
 			var dest = ChooseHelipad(self);
 
-			var initialFacing = self.Info.Traits.Get<OwnedActorInfo>().InitialFacing;
+			var initialFacing = self.Info.Traits.Get<UnitInfo>().InitialFacing;
 
 			if (dest == null)
 				return Util.SequenceActivities(
diff --git a/OpenRa.Game/Traits/Building.cs b/OpenRa.Game/Traits/Building.cs
index f80deff35e..f5920cfae7 100644
--- a/OpenRa.Game/Traits/Building.cs
+++ b/OpenRa.Game/Traits/Building.cs
@@ -14,7 +14,6 @@ namespace OpenRa.Game.Traits
 		public readonly int HP = 0;
 		public readonly ArmorType Armor = ArmorType.none;
 		public readonly bool Crewed = false;		// replace with trait?
-		public readonly int InitialFacing = 128;
 		public readonly int Sight = 0;
 		public readonly bool WaterBound = false;
 	}
diff --git a/OpenRa.Game/Traits/Helicopter.cs b/OpenRa.Game/Traits/Helicopter.cs
index 6a49fd8aa3..34731a21c7 100644
--- a/OpenRa.Game/Traits/Helicopter.cs
+++ b/OpenRa.Game/Traits/Helicopter.cs
@@ -49,7 +49,7 @@ namespace OpenRa.Game.Traits
 			{
 				self.CancelActivity();
 				self.QueueActivity(new HeliFly(Util.CenterOfCell(order.TargetLocation)));
-				self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<OwnedActorInfo>().InitialFacing ) );
+				self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing ) );
 				self.QueueActivity(new HeliLand(true));
 			}
 
@@ -66,7 +66,7 @@ namespace OpenRa.Game.Traits
 
 				self.CancelActivity();
 				self.QueueActivity(new HeliFly(order.TargetActor.CenterLocation + offsetVec));
-				self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<OwnedActorInfo>().InitialFacing ) );
+				self.QueueActivity( new Turn( self.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing ) );
 				self.QueueActivity(new HeliLand(false));
 				self.QueueActivity(order.TargetActor.Info.Name == "hpad"
 					? (IActivity)new Rearm() : new Repair());
diff --git a/OpenRa.Game/Traits/Production.cs b/OpenRa.Game/Traits/Production.cs
index 794b7e4479..28cbda8be8 100755
--- a/OpenRa.Game/Traits/Production.cs
+++ b/OpenRa.Game/Traits/Production.cs
@@ -26,7 +26,7 @@ namespace OpenRa.Game.Traits
 
 		public virtual int CreationFacing( Actor self, Actor newUnit )
 		{
-			return newUnit.Info.Traits.GetOrDefault<OwnedActorInfo>().InitialFacing;
+			return newUnit.Info.Traits.GetOrDefault<UnitInfo>().InitialFacing;
 		}
 
 		public bool Produce( Actor self, NewUnitInfo producee )
diff --git a/OpenRa.Game/Traits/Unit.cs b/OpenRa.Game/Traits/Unit.cs
index 6d07eee4f2..d0fe1b0ed6 100755
--- a/OpenRa.Game/Traits/Unit.cs
+++ b/OpenRa.Game/Traits/Unit.cs
@@ -4,6 +4,7 @@ namespace OpenRa.Game.Traits
 {
 	class UnitInfo : OwnedActorInfo, ITraitInfo
 	{
+		public readonly int InitialFacing = 128;
 		public readonly int ROT = 0;
 		public readonly int Speed = 0;
 
diff --git a/RulesConverter/Program.cs b/RulesConverter/Program.cs
index 0adc47da5f..950eeb3138 100644
--- a/RulesConverter/Program.cs
+++ b/RulesConverter/Program.cs
@@ -109,7 +109,6 @@ namespace RulesConverter
 					{ "Armor", "Armor" }, 
 					{ "Crewed", "Crewed" },
 					{ "WaterBound", "WaterBound" },
-					{ "InitialFacing", "InitialFacing" },
 					{ "Sight", "Sight" },
 					{ "Unsellable", "Unsellable" } }
 				},
diff --git a/ra.yaml b/ra.yaml
index 896b76af13..cf0ec2a995 100644
--- a/ra.yaml
+++ b/ra.yaml
@@ -789,7 +789,6 @@ GUN:
 		HP: 400
 		Armor: heavy
 		Crewed: yes
-		InitialFacing: 50
 		Sight: 6
 	Turreted:
 		ROT: 12
@@ -820,7 +819,6 @@ AGUN:
 		HP: 400
 		Armor: heavy
 		Crewed: yes
-		InitialFacing: 224
 		Sight: 6
 	Turreted:
 		ROT: 15