pat: reverting previous commit and only fixing x:packaging for now.