diff --git a/res/cardsfolder/s/swans_of_bryn_argoll.txt b/res/cardsfolder/s/swans_of_bryn_argoll.txt
index b4dd7d5b056..b5b1c3fa85b 100644
--- a/res/cardsfolder/s/swans_of_bryn_argoll.txt
+++ b/res/cardsfolder/s/swans_of_bryn_argoll.txt
@@ -1,8 +1,10 @@
 Name:Swans of Bryn Argoll
 ManaCost:2 WU WU
 Types:Creature Bird Spirit
-Text:If a source would deal damage to CARDNAME, prevent that damage. The source's controller draws cards equal to the damage prevented this way.
 PT:4/3
 K:Flying
+R:Event$ DamageDone | ActiveZones$ Battlefield | ValidTarget$ Card.Self | ReplaceWith$ DBDraw | PreventionEffect$ True | Description$ If a source would deal damage to CARDNAME, prevent that damage. The source's controller draws cards equal to the damage prevented this way.
+SVar:DBDraw:AB$ Draw | Cost$ 0 | NumCards$ X | Defined$ ReplacedSourceController | References$ X
+SVar:X:ReplaceCount$DamageAmount
 SVar:Picture:http://www.wizards.com/global/images/magic/general/swans_of_bryn_argoll.jpg
 Oracle:Flying\nIf a source would deal damage to Swans of Bryn Argoll, prevent that damage. The source's controller draws cards equal to the damage prevented this way.
\ No newline at end of file
diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index dab25426325..0495d27dc66 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -7248,9 +7248,6 @@ public class Card extends GameEntity implements Comparable<Card> {
 
         // specific Cards
         if (this.isCreature()) { // and not a planeswalker
-            if (this.getName().equals("Swans of Bryn Argoll")) {
-                return 0;
-            }
 
             if (source.isCreature() && getGame().isCardInPlay("Well-Laid Plans")
                     && source.sharesColorWith(this)) {
@@ -7353,10 +7350,6 @@ public class Card extends GameEntity implements Comparable<Card> {
             }
         }
 
-        if (this.getName().equals("Swans of Bryn Argoll")) {
-            source.getController().drawCards(restDamage);
-            return 0;
-        }
 
         final HashMap<String, Object> repParams = new HashMap<String, Object>();
         repParams.put("Event", "DamageDone");