Revert "Water height and slight change to collision"

This reverts commit 7413f0c0cfc25b2fe561b9559fce9ca064b3354f.