You're right, mine is the classic. The problem started when ignition switch failed. I bought a replacement which had a plug to the switch and a corresponding plug with butt connectors already attached. I cut the wires to the existing switch and connected them to the same color on the new switch wiring harness. That solved the problem of the bike intermittently shutting off when the handlebars turned back and forth. I think there was a break in the wiring from years of moving back and forth. The battery is only 1 or 2 months old.