Revert "Zip"

This reverts commit 2bc8d9bf5a5226bb9a25ab1c5792275cd730e65b.
Revert "Revert "Zip""

This reverts commit ae2ae6abc555730f689e9971e4959784074e88dc.