diff --git a/res/cardsfolder/k/kira_great_glass_spinner.txt b/res/cardsfolder/k/kira_great_glass_spinner.txt
index 45098ffa9f1..e12860e9fe1 100644
--- a/res/cardsfolder/k/kira_great_glass_spinner.txt
+++ b/res/cardsfolder/k/kira_great_glass_spinner.txt
@@ -1,7 +1,6 @@
 Name:Kira, Great Glass-Spinner
 ManaCost:1 U U
 Types:Legendary Creature Spirit
-Text:no text
 PT:2/2
 K:Flying
 S:Mode$ Continuous | Affected$ Creature.YouCtrl | AddTrigger$ KiraGlassSpinnerTrig | AddSVar$ KiraGlassSpinnerCounter & Targeting | Description$ Creatures you control have "Whenever this creature becomes the target of a spell or ability for the first time in a turn, counter that spell or ability."
diff --git a/res/cardsfolder/n/nissas_chosen.txt b/res/cardsfolder/n/nissas_chosen.txt
index 713e3354eef..169f522559d 100644
--- a/res/cardsfolder/n/nissas_chosen.txt
+++ b/res/cardsfolder/n/nissas_chosen.txt
@@ -1,8 +1,9 @@
 Name:Nissa's Chosen
 ManaCost:G G
 Types:Creature Elf Warrior
-Text:If Nissa's Chosen would be put into a graveyard from the battlefield, put it on the bottom of its owner's library instead.
 PT:2/3
+R:Event$ Moved | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | ReplaceWith$ NissaChosenRep | Description$ If CARDNAME would die, put it on the bottom of its owner's library instead.
+SVar:NissaChosenRep:AB$ ChangeZone | Cost$ 0 | Hidden$ True | Origin$ All | Destination$ Library | LibraryPosition$ -1 | Defined$ ReplacedCard
 SVar:Picture:http://www.wizards.com/global/images/magic/general/nissas_chosen.jpg
 Oracle:If Nissa's Chosen would die, put it on the bottom of its owner's library instead.
 SetInfo:ZEN Common
\ No newline at end of file
diff --git a/src/main/java/forge/game/GameAction.java b/src/main/java/forge/game/GameAction.java
index 8a4153a5ca6..33ccd05c1cc 100644
--- a/src/main/java/forge/game/GameAction.java
+++ b/src/main/java/forge/game/GameAction.java
@@ -470,10 +470,6 @@ public class GameAction {
         final PlayerZone grave = owner.getZone(ZoneType.Graveyard);
         final PlayerZone exile = owner.getZone(ZoneType.Exile);
 
-        if (c.getName().equals("Nissa's Chosen") && origZone.is(ZoneType.Battlefield)) {
-            return this.moveToLibrary(c, -1);
-        }
-
         if (c.hasKeyword("If CARDNAME would be put into a graveyard, exile it instead.")) {
             return this.moveTo(exile, c);
         }