diff --git a/res/cardsfolder/s/stuffy_doll.txt b/res/cardsfolder/s/stuffy_doll.txt
index c18fda7d1b6..067a30c3982 100644
--- a/res/cardsfolder/s/stuffy_doll.txt
+++ b/res/cardsfolder/s/stuffy_doll.txt
@@ -1,10 +1,13 @@
 Name:Stuffy Doll
 ManaCost:5
 Types:Artifact Creature Construct
-Text:Whenever damage is dealt to Stuffy Doll, it deals that much damage to your opponent.
+Text:no text
 PT:0/1
 K:Indestructible
 A:AB$ DealDamage | Cost$ T | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to itself.
+T:Mode$ DamageDone | Execute$ TrigDamage | ValidTarget$ Card.Self | TriggerZones$ Battlefield | TriggerDescription$ Whenever damage is dealt to CARDNAME, it deals that much damage to your opponent.
+SVar:TrigDamage:AB$DealDamage | Cost$ 0 | NumDmg$ X | Defined$ Opponent
+SVar:X:TriggerCount$DamageAmount
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/tsp/en-us/card116724.jpg
 SetInfo:TSP|Rare|http://magiccards.info/scans/en/ts/264.jpg
diff --git a/src/main/java/forge/GameActionUtil.java b/src/main/java/forge/GameActionUtil.java
index ca1eb8faa04..c637efd72e7 100644
--- a/src/main/java/forge/GameActionUtil.java
+++ b/src/main/java/forge/GameActionUtil.java
@@ -599,23 +599,6 @@ public final class GameActionUtil {
             return;
         }
 
-        if (affected.getName().equals("Stuffy Doll")) {
-            final Player opponent = affected.getOwner().getOpponent();
-            final int stuffyDamage = damage;
-            SpellAbility ability = new Ability(affected, "0") {
-                @Override
-                public void resolve() {
-                    opponent.addDamage(stuffyDamage, affected);
-                }
-            };
-            StringBuilder sb = new StringBuilder();
-            sb.append(affected.getName() + " - Deals ").append(stuffyDamage).append(" damage to ").append(opponent);
-            ability.setStackDescription(sb.toString());
-
-            AllZone.getStack().addSimultaneousStackEntry(ability);
-
-        }
-
         if (affected.hasKeyword("Whenever CARDNAME is dealt damage, put a +1/+1 counter on it.")) {
             Ability ability2 = new Ability(affected, "0") {
                 @Override