diff --git a/res/cardsfolder/goblin_guide.txt b/res/cardsfolder/goblin_guide.txt
index 945325c62db..e8394945d3a 100644
--- a/res/cardsfolder/goblin_guide.txt
+++ b/res/cardsfolder/goblin_guide.txt
@@ -1,9 +1,11 @@
 Name:Goblin Guide
 ManaCost:R
 Types:Creature Goblin Scout
-Text:Whenever Goblin Guide attacks, defending player reveals the top card of his or her library. If it's a land card, that player puts it into his or her hand.
+Text:no text
 PT:2/2
 K:Haste
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDig | TriggerDescription$ Whenever CARDNAME attacks, defending player reveals the top card of his or her library. If it's a land card, that player puts it into his or her hand.
+SVar:TrigDig:AB$Dig | Cost$ 0 | Defined$ DefendingPlayer | DigNum$ 1 | Reveal$ True | ChangeNum$ All | ChangeValid$ Land | LibraryPosition2$ 0
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_guide.jpg
 SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/126.jpg
diff --git a/res/cardsfolder/lorthos_the_tidemaker.txt b/res/cardsfolder/lorthos_the_tidemaker.txt
index a04527bd2dd..54f89534e97 100644
--- a/res/cardsfolder/lorthos_the_tidemaker.txt
+++ b/res/cardsfolder/lorthos_the_tidemaker.txt
@@ -3,7 +3,7 @@ ManaCost:5 U U U
 Types:Legendary Creature Octopus
 Text:no text
 PT:8/8
-T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME the Tidemaker attacks, you may pay . If you do, tap up to eight target permanents. Those permanents don't untap during their controllers' next untap steps.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | OptionalDecider$ You | TriggerDescription$ Whenever CARDNAME the Tidemaker attacks, you may pay 8. If you do, tap up to eight target permanents. Those permanents don't untap during their controllers' next untap steps.
 SVar:TrigTap:AB$ Tap | Cost$ 8 | ValidTgts$ Permanent | TargetMin$ 0 | TargetMax$ 8 | TgtPrompt$ Select target permanent | SubAbility$ SVar=DBPump
 SVar:DBPump:DB$Pump | Defined$ Targeted | Permanent$ True | KW$ HIDDEN This card doesn't untap during your next untap step.
 SVar:Rarity:Mythic
diff --git a/src/forge/CombatUtil.java b/src/forge/CombatUtil.java
index 22fbb60a21c..541ad498345 100644
--- a/src/forge/CombatUtil.java
+++ b/src/forge/CombatUtil.java
@@ -1568,35 +1568,6 @@ public class CombatUtil {
 	                }
                 }
             }//Sapling of Colfenor
-            
-            else if(c.getName().equals("Goblin Guide") && !c.getCreatureAttackedThisCombat()) {
-                final Player opp = c.getController().getOpponent();
-                
-                Ability ability = new Ability(c, "0") {
-                    @Override
-                    public void resolve() {
-                        PlayerZone lib = AllZone.getZone(Constant.Zone.Library, opp);
-                        if(lib.size() > 0) {
-                            CardList cl = new CardList();
-                            cl.add(lib.get(0));
-                            GuiUtils.getChoiceOptional("Top card:", cl.toArray());
-                            
-                            Card c = cl.get(0);
-                            if(c.isLand()) {
-                                AllZone.GameAction.moveToHand(c);
-                            }
-                        }
-                    }
-                };
-                
-                StringBuilder sb = new StringBuilder();
-                sb.append("Goblin Guide - defending player reveals the top card of his or her library. ");
-                sb.append("If it's a land card, that player puts it into his or her hand.");
-                ability.setStackDescription(sb.toString()); 
-                
-                AllZone.Stack.add(ability);
-                
-            }//Goblin Guide
 
             c.setCreatureAttackedThisCombat(true);
     }//checkDeclareAttackers