diff --git a/res/cardsfolder/c/contested_war_zone.txt b/res/cardsfolder/c/contested_war_zone.txt
index f42d4448a59..a6b9cfe4ce8 100644
--- a/res/cardsfolder/c/contested_war_zone.txt
+++ b/res/cardsfolder/c/contested_war_zone.txt
@@ -1,7 +1,9 @@
 Name:Contested War Zone
 ManaCost:no cost
 Types:Land
-Text:Whenever a creature deals combat damage to you, that creature's controller gains control of CARDNAME.
+Text:no text
+T:Mode$ DamageDone | ValidSource$ Creature | ValidTarget$ You  | CombatDamage$ True | Execute$ TrigControl | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature deals combat damage to you, that creature's controller gains control of CARDNAME.
+SVar:TrigControl:AB$ GainControl | Cost$ 0 | Defined$ Self | NewController$ TriggeredSourceController
 A:AB$ Mana | Cost$ T | Produced$ 1 | SpellDescription$ Add 1 to your mana pool.
 A:AB$ PumpAll | Cost$ 1 T | ValidCards$ Creature.attacking | NumAtt$ +1 | SpellDescription$ Attacking creatures get +1/+0 until end of turn.
 SVar:Rarity:Rare
diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java
index 1875c7a2abf..ea8bc812735 100644
--- a/src/main/java/forge/GameActionUtil.java
+++ b/src/main/java/forge/GameActionUtil.java
@@ -748,24 +748,6 @@ public final class GameActionUtil {
             return;
         }
 
-        if (c.isCreature() && AllZoneUtil.isCardInPlay("Contested War Zone", player)) {
-            final List<Card> zones = player.getCardsIn(ZoneType.Battlefield, "Contested War Zone");
-            for (final Card zone : zones) {
-                final Ability ability = new Ability(zone, "0") {
-                    @Override
-                    public void resolve() {
-                        if (AllZoneUtil.isCardInPlay(zone)) {
-                            zone.addController(c.getController());
-                        }
-                    }
-                };
-                ability.setStackDescription(zone + " - " + c.getController() + " gains control of " + zone);
-
-                AllZone.getStack().addSimultaneousStackEntry(ability);
-
-            }
-        }
-
         if (c.hasStartOfKeyword("Poisonous")) {
             final int keywordPosition = c.getKeywordPosition("Poisonous");
             final String parse = c.getKeyword().get(keywordPosition).toString();
@@ -807,7 +789,8 @@ public final class GameActionUtil {
 
         if (c.getName().equals("Scalpelexis")) {
             GameActionUtil.playerCombatDamageScalpelexis(c);
-        } else if (c.isEnchantedBy("Celestial Mantle")) {
+        }
+        if (c.isEnchantedBy("Celestial Mantle")) {
             GameActionUtil.executeCelestialMantle(c);
         }