Revert archive changes around creating Upstream-commit: 50c33ee877ce1b395f2945809a03261df54e0d9b Component: engine