am 386a7f33: Reconcile differences between zip implementations

* commit '386a7f3314911c9250ec984092022ed634dfdb6d':
  Reconcile differences between zip implementations