Revert "Trying to fix water collision"

This reverts commit 660658500a887e7051ed5aa53713244e816418e5.