--- a/net/minecraft/server/EntitySquid.java
+++ b/net/minecraft/server/EntitySquid.java
@@ -67,9 +67,11 @@
 
     }
 
+    /* CraftBukkit start - Delegate to Entity to use existing inWater value
     public boolean V() {
         return this.world.a(this.getBoundingBox().grow(0.0D, -0.6000000238418579D, 0.0D), Material.WATER, (Entity) this);
     }
+    // CraftBukkit end */
 
     public void m() {
         super.m();