 It does count and you don't get rebaptized so long as that original baptism was valid. So the requirements for validity would be valid matter, which is water. It can't be motor oil or Kool-Aid or something.