the first part of the patch has to go, indeed; 
how about the 2nd part? is that relevant at all? I never got which pax problem it really solves...