I've got a similar but opposite situation, any time I've pulled my distributor, my drive gear/shaft pops up with it and the only way to get it seated back in the pump is to turn the motor over, meaning I lose my timing marks. Anyone else ever have trouble with this? Is my shaft possibly worn out?