Yes. Carefully disassemble the connector as the OP stated. It will take some time, but be gentle. The connectors have a tab on the side and will slide out the back of the connector housing. The terminal/wire going to the starter from the NSS was totally corroded and broke when I was...
I know this thread has been out for awhile, however, I wanted to contribute because my 96 had an intermittent starting problem, too. I found my problem to be a corroded wire/terminal connection going from the NSS to the starter. The long sought after female terminal is a: Sumitomo 4.8mm...