Revert "Water"

This reverts commit fd08ac8f5ec6b766b26cefe8122a9cc16d52cf01.