diff --git a/res/cardsfolder/cinder_pyromancer.txt b/res/cardsfolder/cinder_pyromancer.txt
index 5f0c28535d4..1db26d7bd5e 100644
--- a/res/cardsfolder/cinder_pyromancer.txt
+++ b/res/cardsfolder/cinder_pyromancer.txt
@@ -1,9 +1,11 @@
 Name:Cinder Pyromancer
 ManaCost:2 R
 Types:Creature Elemental Shaman
-Text:Whenever you cast a red spell, you may untap Cinder Pyromancer.
+Text:no text
 PT:0/1
 A:AB$DealDamage | Cost$ T | Tgt$ TgtP | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to target player.
+T:Mode$ SpellCast | ValidCard$ Card.Red | TriggerZone$ Battlefield | Optional$ True | Execute$ TrigUntap | TriggerDescription$ Whenever you cast a red spell, you may untap CARDNAME.  
+SVar:TrigUntap:AB$Untap | Cost$ 0 | Defined$ Self
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cinder_pyromancer.jpg
 SetInfo:EVE|Common|http://magiccards.info/scans/en/eve/50.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 00e53e65f4a..41e47d2f7cd 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -500,7 +500,6 @@ public class GameActionUtil {
 		playCard_Witch_Maw_Nephilim(c);
 		playCard_Forced_Fruition(c);
 		playCard_Gelectrode(c);
-		playCard_Cinder_Pyromancer(c);
 		playCard_Standstill(c);
 		playCard_SolKanar(c);
 		playCard_Gilt_Leaf_Archdruid(c);
@@ -2108,42 +2107,6 @@ public class GameActionUtil {
         }
     }// Gelectrode
 
-    public static void playCard_Cinder_Pyromancer(Card c) {
-        final Player controller = c.getController();
-
-        final PlayerZone play = AllZone.getZone(Constant.Zone.Battlefield, controller);
-
-        CardList list = new CardList();
-        list.addAll(play.getCards());
-        list = list.getName("Cinder Pyromancer");
-
-        if (list.size() > 0 && c.isRed()) {
-            for (int i = 0; i < list.size(); i++) {
-                final Card card = list.get(i);
-                
-                Ability ability2 = new Ability(card, "0") {
-                    @Override
-                    public void resolve() {
-                        if (controller.isHuman()) {
-                            String question = "Untap your Cinder Pyromancer?";
-                            if (showYesNoDialog(card, question)) {
-                                card.untap();
-                            }
-                        }// controller isComputer()
-                        else card.untap(); 
-                        
-                    }// resolve()
-                };// ability2
-
-                StringBuilder sb = new StringBuilder();
-                sb.append(card.getName()).append(" - ").append(c.getController());
-                sb.append(" played a red spell, you may untap Cinder Pyromancer.");
-                ability2.setStackDescription(sb.toString());
-                AllZone.Stack.add(ability2);
-            }
-        }
-    }// Cinder_Pyromancer
-
 	public static void playCard_Forced_Fruition(Card c) {
 		PlayerZone hplay = AllZone.getZone(Constant.Zone.Battlefield, AllZone.HumanPlayer);
 		PlayerZone cplay = AllZone.getZone(Constant.Zone.Battlefield, AllZone.ComputerPlayer);