I always get rid of the plug completely.
It means taking the control box apart though. As fewer plugs as poss and everything soldered is the way forward! While ya there ya can cut the in gear start out to save ya g.box abit to!
Nice grommet in the hole the original plug came out of around the wiring, bobs ya uncle. Job done and no probs again.