Given that this is stuck waiting for upstream to figure out a way forward, which looks unlikely at the moment, plus we have a suitable workaround, I'm going to mark this as Won't Fix.
Given that this is stuck waiting for upstream to figure out a way forward, which looks unlikely at the moment, plus we have a suitable workaround, I'm going to mark this as Won't Fix.