Water-borne diseases make comeback