Revert all the archive2 stuff.