Since I repro and am active in this space, I'll see if I can fix in ~10 minutes and if not I'll buy time with a revert if @average-vr-56795 agrees