Do Jehovah’s Witnesses need to be re-baptized?

QUESTION: Do we need to be re-baptized if we were immersed under the Watchtower’s rules and the outright idolatry we engaged in by answering those two baptism questions?