Revert "Revert "Zip""

This reverts commit fb21c0afe4752a00460d5ba68d343473c11a442a.
Revert "Revert "Revert "Zip"""

This reverts commit d2698d703a9739247d6584b17714b53854a44b8d.