diff --git a/res/cardsfolder/b/blade_of_the_bloodchief.txt b/res/cardsfolder/b/blade_of_the_bloodchief.txt
index 84471f17bb3..35af3de4118 100644
--- a/res/cardsfolder/b/blade_of_the_bloodchief.txt
+++ b/res/cardsfolder/b/blade_of_the_bloodchief.txt
@@ -2,8 +2,10 @@ Name:Blade of the Bloodchief
 ManaCost:1
 Types:Artifact Equipment
 Text:no text
-# TODO - Convert this to script
 K:Equip 1
+T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigGainCounter | TriggerDescription$ Whenever a creature is put into a graveyard from the battlefield, put a +1/+1 counter on equipped creature. If equipped creature is a Vampire, put two +1/+1 counters on it instead.
+SVar:TrigGainCounter:DB$ PutCounter | Defined$ Equipped | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Count$Valid Creature.EquippedBy+Vampire/Plus.1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/blade_of_the_bloodchief.jpg
 SetInfo:ZEN|Rare|http://magiccards.info/scans/en/zen/196.jpg
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java b/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java
index dca8567d1bc..515b2efb3c4 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryEquipment.java
@@ -45,35 +45,7 @@ class CardFactoryEquipment {
      * @return a {@link forge.Card} object.
      */
     public static void buildCard(final Card card, final String cardName) {
-
-        // *************** START *********** START **************************
-        if (cardName.equals("Blade of the Bloodchief")) {
-            final Ability triggeredAbility = new Ability(card, "0") {
-                @Override
-                public void resolve() {
-                    if (card.getEquipping().size() != 0) {
-                        final Card equipping = card.getEquipping().get(0);
-                        if (equipping.isType("Vampire")) {
-                            equipping.addCounter(Counters.P1P1, 2);
-                        } else {
-                            equipping.addCounter(Counters.P1P1, 1);
-                        }
-                    }
-                }
-            };
-
-            final StringBuilder sbTrig = new StringBuilder();
-            sbTrig.append("Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ");
-            sbTrig.append("ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigOverride | ");
-            sbTrig.append("TriggerDescription$ Whenever a creature is put into a graveyard ");
-            sbTrig.append("from the battlefield, put a +1/+1 counter on equipped creature. ");
-            sbTrig.append("If equipped creature is a Vampire, put two +1/+1 counters on it instead.");
-            final Trigger myTrigger = TriggerHandler.parseTrigger(sbTrig.toString(), card, true);
-            myTrigger.setOverridingAbility(triggeredAbility);
-
-            card.addTrigger(myTrigger);
-        } // *************** END ************ END **************************
-
+        // TODO: Move Living Weapon to main Keyword generator, and delete this file
         if (card.hasKeyword("Living Weapon")) {
             card.removeIntrinsicKeyword("Living Weapon");