SPIGOT-2336: Zombie.setVillager(Z)V

src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java

@@ -40,7 +40,11 @@ public class CraftZombie extends CraftMonster implements Zombie {
     }
 
     public void setVillager(boolean flag) {
-        getHandle().setVillagerType(0);
+        if (flag) {
+            getHandle().setVillagerType(0);
+        } else {
+            getHandle().clearVillagerType();
+        }
     }
 
     @Override