Revert to old style archive management