Removed zip_safe for now.