diff --git a/OpenRA.Mods.RA/Air/FlyAwayOnIdle.cs b/OpenRA.Mods.RA/Air/FlyAwayOnIdle.cs
new file mode 100644
index 0000000000..71df7075f6
--- /dev/null
+++ b/OpenRA.Mods.RA/Air/FlyAwayOnIdle.cs
@@ -0,0 +1,27 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2014 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation. For more information,
+ * see COPYING.
+ */
+#endregion
+
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
+
+namespace OpenRA.Mods.RA.Air
+{
+	[Desc("Leave the map when idle.")]
+	class FlyAwayOnIdleInfo : TraitInfo<FlyAwayOnIdle> { }
+
+	class FlyAwayOnIdle : INotifyIdle
+	{
+		public void TickIdle(Actor self)
+		{
+			self.QueueActivity(new FlyOffMap());
+			self.QueueActivity(new RemoveSelf());
+		}
+	}
+}
\ No newline at end of file
diff --git a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
index c3e749dfbc..35d00693db 100755
--- a/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
+++ b/OpenRA.Mods.RA/Air/ReturnOnIdle.cs
@@ -59,15 +59,4 @@ namespace OpenRA.Mods.RA.Air
 			}
 		}
 	}
-
-	class FlyAwayOnIdleInfo : TraitInfo<FlyAwayOnIdle> { }
-
-	class FlyAwayOnIdle : INotifyIdle
-	{
-		public void TickIdle(Actor self)
-		{
-			self.QueueActivity(new FlyOffMap());
-			self.QueueActivity(new RemoveSelf());
-		}
-	}
 }
diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
index fd531ad9d4..847590105e 100644
--- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
+++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
@@ -527,6 +527,7 @@
     <Compile Include="Graphics\ContrailRenderable.cs" />
     <Compile Include="Graphics\TextRenderable.cs" />
     <Compile Include="Graphics\VoxelRenderable.cs" />
+    <Compile Include="Air\FlyAwayOnIdle.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.Game\OpenRA.Game.csproj">