--- ../work/decompile-bb26c12b/net/minecraft/server/EntityChicken.java	2014-11-27 08:59:46.657422040 +1100
+++ src/main/java/net/minecraft/server/EntityChicken.java	2014-11-27 08:42:10.104851005 +1100
@@ -35,6 +35,11 @@
     }
 
     public void m() {
+        // CraftBukkit start
+        if (this.isChickenJockey()) {
+            this.persistent = !this.isTypeNotPersistent();
+        }
+        // CraftBukkit end
         super.m();
         this.bo = this.bk;
         this.bn = this.bm;