diff --git a/MODSRC/vazkii/botania/common/core/handler/BaubleLoadHandler.java b/MODSRC/vazkii/botania/common/core/handler/BaubleLoadHandler.java
deleted file mode 100644
index 928d1302f..000000000
--- a/MODSRC/vazkii/botania/common/core/handler/BaubleLoadHandler.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * This class was created by <Vazkii>. It's distributed as
- * part of the Botania Mod. Get the Source Code in github:
- * https://github.com/Vazkii/Botania
- * 
- * Botania is Open Source and distributed under a
- * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License
- * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB)
- * 
- * File Created @ [Aug 22, 2014, 3:13:17 PM (GMT)]
- */
-package vazkii.botania.common.core.handler;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.WeakHashMap;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
-import cpw.mods.fml.common.eventhandler.EventPriority;
-import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-
-public final class BaubleLoadHandler {
-
-	public static Set<EntityPlayer> tickedPlayers = Collections.newSetFromMap(new WeakHashMap());
-	public static Set<EntityPlayer> tickingPlayers = Collections.newSetFromMap(new WeakHashMap());
-
-	@SubscribeEvent(priority = EventPriority.LOWEST)
-	public void onTick(LivingUpdateEvent event) {
-		if(event.entity instanceof EntityPlayer && tickingPlayers.contains(event.entity)) {
-			tickingPlayers.remove(event.entity);
-			tickedPlayers.add((EntityPlayer) event.entity);
-		}
-	}
-	
-}
diff --git a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
index b2f1a651e..28fb020c7 100644
--- a/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
+++ b/MODSRC/vazkii/botania/common/core/proxy/CommonProxy.java
@@ -20,7 +20,6 @@ import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.ModBlocks;
-import vazkii.botania.common.core.handler.BaubleLoadHandler;
 import vazkii.botania.common.core.handler.BiomeDecorationHandler;
 import vazkii.botania.common.core.handler.ChestGenHandler;
 import vazkii.botania.common.core.handler.CommonTickHandler;
@@ -81,7 +80,6 @@ public class CommonProxy {
 		MinecraftForge.EVENT_BUS.register(new PixieHandler());
 		MinecraftForge.EVENT_BUS.register(new SheddingHandler());
 		MinecraftForge.EVENT_BUS.register(new SpawnerChangingHandler());
-		MinecraftForge.EVENT_BUS.register(new BaubleLoadHandler());
 
 		FMLCommonHandler.instance().bus().register(new CommonTickHandler());
 	}
diff --git a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemBauble.java b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemBauble.java
index 4bad8bb4c..d60f56a7a 100644
--- a/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemBauble.java
+++ b/MODSRC/vazkii/botania/common/item/equipment/bauble/ItemBauble.java
@@ -24,7 +24,6 @@ import net.minecraft.world.World;
 
 import org.lwjgl.input.Keyboard;
 
-import vazkii.botania.common.core.handler.BaubleLoadHandler;
 import vazkii.botania.common.item.ItemMod;
 import baubles.api.BaubleType;
 import baubles.api.IBauble;
@@ -102,10 +101,8 @@ public abstract class ItemBauble extends ItemMod implements IBauble {
 
 	@Override
 	public void onWornTick(ItemStack stack, EntityLivingBase player) {
-		if(player instanceof EntityPlayer && !BaubleLoadHandler.tickedPlayers.contains(player)) {
+		if(player.ticksExisted == 1)
 			onEquippedOrLoadedIntoWorld(stack, player);
-			BaubleLoadHandler.tickingPlayers.add((EntityPlayer) player);
-		}
 	}
 
 	@Override