Patching v3 to support v4+ unwrapped messages.