Issue #119: change to how we bundle zips