Remove dependency on archive.