x-custom/infozip: Synced with upstream