--- /home/matt/mc-dev-private//net/minecraft/server/EntityChicken.java	2015-02-26 22:40:22.491608140 +0000
+++ src/main/java/net/minecraft/server/EntityChicken.java	2015-02-26 22:40:22.491608140 +0000
@@ -35,6 +35,11 @@
     }
 
     public void m() {
+        // CraftBukkit start
+        if (this.isChickenJockey()) {
+            this.persistent = !this.isTypeNotPersistent();
+        }
+        // CraftBukkit end
         super.m();
         this.bq = this.bm;
         this.bp = this.bo;