diff --git a/res/cardsfolder/the_unspeakable.txt b/res/cardsfolder/the_unspeakable.txt
index d5e5a124387..e8e7b9d078e 100644
--- a/res/cardsfolder/the_unspeakable.txt
+++ b/res/cardsfolder/the_unspeakable.txt
@@ -1,10 +1,12 @@
 Name:The Unspeakable
 ManaCost:6 U U U
 Types:Legendary Creature Spirit
-Text:Whenever CARDNAME deals combat damage to a player, you may return target Arcane card from your graveyard to your hand.
+Text:no text
 PT:6/7
 K:Flying
 K:Trample
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target Arcane card from your graveyard to your hand.
+SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Arcane.YouCtrl
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/chk/en-us/card78693.jpg
 SetInfo:CHK|Rare|http://magiccards.info/scans/en/chk/98.jpg
diff --git a/res/cardsfolder/woebearer.txt b/res/cardsfolder/woebearer.txt
index 35791fbda0d..4cbda3ab113 100644
--- a/res/cardsfolder/woebearer.txt
+++ b/res/cardsfolder/woebearer.txt
@@ -1,9 +1,11 @@
 Name:Woebearer
 ManaCost:4 B
 Types:Creature Zombie
-Text:Whenever CARDNAME deals combat damage to a player, you may return target creature card from your graveyard to your hand.
+Text:no text
 PT:2/3
 K:Fear
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Opponent | CombatDamage$ True | Execute$ TrigReturn | TriggerZones$ Battlefield | Optional$ True | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may return target creature card from your graveyard to your hand.
+SVar:TrigReturn:AB$ChangeZone | Cost$ 0 | Origin$ Graveyard | Destination$ Hand | ValidTgts$ Creature.YouCtrl
 SVar:Rarity:Uncommon
 SVar:Picture:http://www.wizards.com/global/images/magic/general/woebearer.jpg
 SetInfo:MRD|Uncommon|http://magiccards.info/scans/en/mi/83.jpg
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 696c6095527..cbb87a7c8b3 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -4433,8 +4433,6 @@ public class GameActionUtil {
 		else if(c.getName().equals("Silent Specter")) opponent_Discard(c, 2);
 		 */
 		
-		else if(c.getName().equals("The Unspeakable")) may_Return_Graveyard_to_Hand(c, "Arcane".split(","));
-		else if(c.getName().equals("Woebearer")) may_Return_Graveyard_to_Hand(c, "Creature".split(","));
 		else if(c.isEnchantedBy("Necromantic Thirst")) may_Return_Graveyard_to_Hand(c, "Creature".split(","));
 		else if(c.isEnchantedBy("Celestial Mantle")) execute_Celestial_Mantle( c);