diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
index 12d47daf6b..34eb87252e 100644
--- a/src/main/java/net/minecraft/server/EntityInsentient.java
+++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -377,8 +377,9 @@ public abstract class EntityInsentient extends EntityLiving {
     }
 
     protected void bo() {
-        // CraftBukkit - temporary hack to handle Ocelot despawning
-        if ((this instanceof EntityOcelot && this.isTypeNotPersistent()) || (!this.persistent)) {
+        if (this.persistent) {
+            this.aV = 0;
+        } else {
             EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
 
             if (entityhuman != null) {
@@ -397,11 +398,7 @@ public abstract class EntityInsentient extends EntityLiving {
                     this.aV = 0;
                 }
             }
-        // CraftBukkit start
-        } else {
-            this.aV = 0;
         }
-        // CraftBukkit end
     }
 
     protected void bh() {
diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
index c4e85962f9..069408dbcc 100644
--- a/src/main/java/net/minecraft/server/EntityOcelot.java
+++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -48,7 +48,7 @@ public class EntityOcelot extends EntityTameableAnimal {
     }
 
     protected boolean isTypeNotPersistent() {
-        return !this.isTamed() && this.ticksLived > 2400;
+        return !this.isTamed(); // CraftBukkit
     }
 
     public boolean be() {
diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
index df22e837a6..9d7d4a711e 100644
--- a/src/main/java/net/minecraft/server/EntityWolf.java
+++ b/src/main/java/net/minecraft/server/EntityWolf.java
@@ -339,7 +339,7 @@ public class EntityWolf extends EntityTameableAnimal {
     }
 
     protected boolean isTypeNotPersistent() {
-        return !this.isTamed() && this.ticksLived > 2400;
+        return !this.isTamed(); // CraftBukkit
     }
 
     public boolean a(EntityLiving entityliving, EntityLiving entityliving1) {