Shouldn't `#custom_payload_ref` go away now?