Rather than buy a rebuild from a parts store, see if your area has an automotive electrical specialty shop. If they have access to a source for genuine Bosch replacement parts (brushes, diodes, bearings, etc), chances are their rebuild work will be of better quality.