diff --git a/src/main/java/forge/AllZoneUtil.java b/src/main/java/forge/AllZoneUtil.java
index 256708af87c..c38ffc74b41 100644
--- a/src/main/java/forge/AllZoneUtil.java
+++ b/src/main/java/forge/AllZoneUtil.java
@@ -197,13 +197,8 @@ public abstract class AllZoneUtil {
      * @return a {@link forge.Card} object.
      */
     public static Card getCardState(final Card card) {
-        PlayerZone zone = AllZone.getZoneOf(card);
-        //for tokens
-        if (zone == null) {
-            return null;
-        }
 
-        for (Card c : zone.getCards()) {
+        for (Card c : AllZoneUtil.getCardsInGame()) {
             if (card.equals(c)) {
                 return c;
             }
diff --git a/src/main/java/forge/card/trigger/TriggerHandler.java b/src/main/java/forge/card/trigger/TriggerHandler.java
index 8a0a6942570..612f9dfb805 100644
--- a/src/main/java/forge/card/trigger/TriggerHandler.java
+++ b/src/main/java/forge/card/trigger/TriggerHandler.java
@@ -427,12 +427,6 @@ public class TriggerHandler {
         if (host == null) {
             host = regtrig.getHostCard();
         }
-        // This will fix the Oblivion Ring issue, but is this the right fix?
-        for (Object o : regtrig.getHostCard().getRemembered()) {
-            if (!host.getRemembered().contains(o)) {
-                host.addRemembered(o);
-            }
-        }
 
         sa[0] = regtrig.getOverridingAbility();
         if (sa[0] == null) {