diff --git a/res/cardsfolder/aether_flash.txt b/res/cardsfolder/aether_flash.txt
index 36e6023a91c..4a9aec43350 100644
--- a/res/cardsfolder/aether_flash.txt
+++ b/res/cardsfolder/aether_flash.txt
@@ -1,7 +1,9 @@
 Name:AEther Flash
 ManaCost:2 R R
 Types:Enchantment
-Text:Whenever a creature enters the battlefield, AEther Flash deals 2 damage to it.
+Text:no text
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigDealDamage | TriggerDescription$ Whenever a creature enters the battlefield, CARDNAME deals 2 damage to it. 
+SVar:TrigDealDamage:AB$DealDamage | Cost$ 0 | Defined$ Triggered | NumDmg$ 2
 SVar:RemAIDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aether_flash.jpg
diff --git a/src/forge/PlayerZone_ComesIntoPlay.java b/src/forge/PlayerZone_ComesIntoPlay.java
index bd32d531c68..0d502181953 100644
--- a/src/forge/PlayerZone_ComesIntoPlay.java
+++ b/src/forge/PlayerZone_ComesIntoPlay.java
@@ -108,24 +108,6 @@ public class PlayerZone_ComesIntoPlay extends DefaultPlayerZone {
                 }
             }
             
-            if(c.isCreature()) {
-            	CardList flashes = AllZoneUtil.getCardsInPlay("AEther Flash");
-            	final Card enteringCard = c;
-            	for(final Card flash:flashes){
-                    	SpellAbility ability = new Ability(flash, "") {
-                    		@Override
-                    		public void resolve() {
-                    			enteringCard.addDamage(2, flash);
-                    		}
-                    	};
-                    	StringBuilder sb = new StringBuilder();
-                    	sb.append(flash).append(" - deals 2 damage to ").append(enteringCard.getName());
-                    	ability.setStackDescription(sb.toString());
-                    	
-                    	AllZone.Stack.add(ability);
-                    }
-            }
-            
             if(c.isType("Scarecrow") && AllZoneUtil.isCardInPlay("Reaper King", c.getController())) {
             	CardList kings = AllZoneUtil.getCardsInPlay("Reaper King");
             	kings.remove(c);