Brake master cylinder/proportioning valve interchange

[Timeless]

Cliffs:

Will the proportioning valve and hardlines (from master cylinder to said proportioning valve) off a 1999 XJ directly connect (with no mods) to a 1996 XJ master cylinder?

 

Tech/background:

I have been having a beeyotch of a time getting my rig back on the road due to an epic amount of trouble bleeding my power steering.  I have concluded that somehow the power steering is sucking in air.  Accordingly, I need to rearrange my braking system...

 

because, hydroboost.

 

PO installed hydroboost from an astro van (or something).  It worked great but puts too much draw on the power steering pump.  As best I can tell, the hydroboost unit is introducing air into the power steering lines, or its getting in somewhere else.  Regardless, I don't want the hydroboost anymore as its killing my PS pump.

 

I just received a dual diaphragm brake booster & master cylinder from a 96 XJ.  I intend to remove the hydroboost setup in my rig, install the 96 XJ booster/MC and put my power steering lines back to a more OEM setup.  New power steering lines are on their way.

 

I also want to do away with the OEM MJ "dual" rear brake line.

 

I have the complete brake system from a 99 XJ.  Does anyone know if the 99 XJ proportioning valve (proportioning block) and the hardlines to the MC fit the 96 XJ master cylinder?