Index: ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
+++ ps/trunk/binaries/data/mods/public/simulation/components/UnitAI.js
@@ -683,20 +683,6 @@
 			this.SetNextState("INDIVIDUAL.UNPACKING");
 	},
 
-	"Order.CancelPack": function(msg) {
-		var cmpPack = Engine.QueryInterface(this.entity, IID_Pack);
-		if (cmpPack && cmpPack.IsPacking() && !cmpPack.IsPacked())
-			cmpPack.CancelPack();
-		this.FinishOrder();
-	},
-
-	"Order.CancelUnpack": function(msg) {
-		var cmpPack = Engine.QueryInterface(this.entity, IID_Pack);
-		if (cmpPack && cmpPack.IsPacking() && cmpPack.IsPacked())
-			cmpPack.CancelPack();
-		this.FinishOrder();
-	},
-
 	"Order.MoveToChasingPoint": function(msg) {
 		// Overriden by the CHASING state.
 		// Can however happen outside of it when renaming...
@@ -3317,6 +3303,10 @@
 				return false;
 			},
 
+			"Order.CancelPack": function(msg) {
+				this.FinishOrder();
+			},
+
 			"PackFinished": function(msg) {
 				this.FinishOrder();
 			},
@@ -3338,6 +3328,10 @@
 				return false;
 			},
 
+			"Order.CancelUnpack": function(msg) {
+				this.FinishOrder();
+			},
+
 			"PackFinished": function(msg) {
 				this.FinishOrder();
 			},