I’ll see if I can create a minimal repro outside our repo