Revert "Revert "Revert "Zip"""

This reverts commit 6b7c99c20d07e907c88d17f8bac39fcacceb4442.