diff --git a/OpenRA.Game/Traits/Activities/Idle.cs b/OpenRA.Game/Traits/Activities/Idle.cs
index 02b93ea256..9c5eb213f6 100644
--- a/OpenRA.Game/Traits/Activities/Idle.cs
+++ b/OpenRA.Game/Traits/Activities/Idle.cs
@@ -10,7 +10,7 @@
 
 namespace OpenRA.Traits.Activities
 {
-	class Idle : CancelableActivity
+	public class Idle : CancelableActivity
 	{
 		public override IActivity Tick(Actor self) { return NextActivity; }
 	}
diff --git a/OpenRA.Mods.RA/Activities/IdleAnimation.cs b/OpenRA.Mods.RA/Activities/IdleAnimation.cs
index 95d4b42722..bfe8065773 100644
--- a/OpenRA.Mods.RA/Activities/IdleAnimation.cs
+++ b/OpenRA.Mods.RA/Activities/IdleAnimation.cs
@@ -11,10 +11,11 @@
 using System.Collections.Generic;
 using OpenRA.Mods.RA.Render;
 using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
 namespace OpenRA.Mods.RA.Activities
-{
-	public class IdleAnimation : IActivity
+{
+	public class IdleAnimation : Idle
 	{
 		string sequence;
 		int delay;
@@ -25,10 +26,8 @@ namespace OpenRA.Mods.RA.Activities
 			this.delay = delay;
 		}
 
-		IActivity NextActivity { get; set; }
-
 		bool active = true;
-		public IActivity Tick(Actor self)
+		public override IActivity Tick(Actor self)
 		{
 			if (!active) return NextActivity;
 			
@@ -38,23 +37,11 @@ namespace OpenRA.Mods.RA.Activities
 			return this;
 		}
 
-		public void Cancel(Actor self)
+		protected override bool OnCancel()
 		{
-			active = false;
-			NextActivity = null;
+			active = false;
+			return true;
 		}
 
-		public void Queue( IActivity activity )
-		{
-			if( NextActivity != null )
-				NextActivity.Queue( activity );
-			else
-				NextActivity = activity;
-		}
-
-		public IEnumerable<float2> GetCurrentPath()
-		{
-			yield break;
-		}
 	}
 }