Just in case anyone would run into this, I’ll post this as an answer. The workaround here from laggyluk worked for me.