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

Change-Id: I174426147a0068fe6c3fa956f7b71d704de09eac