diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
index c9e68350fe..6431d041a1 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
+++ b/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