Temporarily add subarchive
Revert "Temporarily add subarchive"

This reverts commit 1999988bbdf66b8a16e62756094b0db0fdfefc91.