Revert "Optimize water color code"

This reverts commit 12fa744732af2067fc0482797c51f105b114b807.