Revert "Old style zip"

This reverts commit 7729b49115db31b4f475d60e1fd5f0f3189d28fc.