Rely on z3 being bundled now