Return to PAC override (remove extras support) (2/3)