Attempt to make the archive metadata resync more robust