Whilst awaiting delivery of the replacement motor I decided to try to repair the offending article. It comes out if you remove the two body screws and slides out. There was a carbon brush missing so I soldered in a replacement. Then I undercut the armature and found I cannot get the whole shaft to go fully home. It is over 1/4 inch shy. I even tried on my okd units and once the shaft comes out, it will not go fully back and I cannot see a logical reason for this. So the whole motor will still have to come off.. Is there any simpler way than drilling these stupid rivets out? Terry 1996 E34