I am not sure you can. To remove water stains you have to use some polishing compound, which contains abrasives. The abrasives in the compound will unfortunately work on the etch too.