diff --git a/OpenRA.Mods.Common/Traits/AutoCarryall.cs b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
index ca562f185d..1d3c2d8539 100644
--- a/OpenRA.Mods.Common/Traits/AutoCarryall.cs
+++ b/OpenRA.Mods.Common/Traits/AutoCarryall.cs
@@ -32,14 +32,6 @@ namespace OpenRA.Mods.Common.Traits
 		{
 			busy = false;
 			FindCarryableForTransport(self);
-
-			// TODO: This should be handled by the Aircraft trait
-			if (!busy)
-			{
-				var aircraft = self.Trait<Aircraft>();
-				var turnSpeedOverride = aircraft.Info.IdleTurnSpeed > -1 ? aircraft.Info.IdleTurnSpeed : aircraft.TurnSpeed;
-				self.QueueActivity(new HeliFlyCircle(self, turnSpeedOverride));
-			}
 		}
 
 		// A carryable notifying us that he'd like to be carried