Revert archive changes around creating

Fixes #6881