Revert attempted zip fixes