[562] Better handle zip files until we have a workable solution