Yup, I ended up taking both units apart and swapping the long shaft for the short. The old unit came apart very easy, while the unit from the 87 seemed tight and had to be forced a little to pull everything out. I'm guessing that's why the older servo leaked because of the worn o-rings. Everything seems to be woking fine so far.