Refs #17302 EEA; fixes to unarchiving process