Waterwalking works when collision is disabled

If you're above water, you won't be able to move into it, which isn't right. Probably introduced by 6e1c67a9. You don't actually "collide" with water, it's the moving to surface logic firing up.