diff --git a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
index 6b0024097..bb572d8b6 100644
--- a/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
+++ b/src/main/scala/li/cil/oc/client/renderer/tileentity/RobotRenderer.scala
@@ -288,7 +288,7 @@ object RobotRenderer extends TileEntitySpecialRenderer {
 
     val proxy = tileEntity.asInstanceOf[tileentity.RobotProxy]
     val robot = proxy.robot
-    val worldTime = EventHandler.totalWorldTicks + f
+    val worldTime = tileEntity.getWorld.getTotalWorldTime + f
 
     RenderState.pushMatrix()
     GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5)
diff --git a/src/main/scala/li/cil/oc/common/EventHandler.scala b/src/main/scala/li/cil/oc/common/EventHandler.scala
index 7c6d7a81e..8bdd74ae4 100644
--- a/src/main/scala/li/cil/oc/common/EventHandler.scala
+++ b/src/main/scala/li/cil/oc/common/EventHandler.scala
@@ -37,7 +37,6 @@ import net.minecraftforge.event.world.WorldEvent
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
 import net.minecraftforge.fml.common.gameevent.PlayerEvent._
 import net.minecraftforge.fml.common.gameevent.TickEvent
-import net.minecraftforge.fml.common.gameevent.TickEvent.ClientTickEvent
 import net.minecraftforge.fml.common.gameevent.TickEvent.ServerTickEvent
 import net.minecraftforge.fml.common.network.FMLNetworkEvent.ClientConnectedToServerEvent
 
@@ -49,8 +48,6 @@ import scala.concurrent.Future
 object EventHandler {
   private val pending = mutable.Buffer.empty[() => Unit]
 
-  var totalWorldTicks = 0L
-
   private val runningRobots = mutable.Set.empty[Robot]
 
   private val keyboards = java.util.Collections.newSetFromMap[Keyboard](new java.util.WeakHashMap[Keyboard, java.lang.Boolean])
@@ -119,11 +116,6 @@ object EventHandler {
     machines --= closed
   }
 
-  @SubscribeEvent
-  def onClientTick(e: ClientTickEvent) = if (e.phase == TickEvent.Phase.START) {
-    totalWorldTicks += 1
-  }
-
   @SubscribeEvent
   def playerLoggedIn(e: PlayerLoggedInEvent) {
     if (SideTracker.isServer) e.player match {