Merge "Revert "Add OEM compatability options for archiving."" into main