IIRC BOLT12 gets rid of this since invoices are directly requested.
PTLCs also fix this.