Here’s how I’ve been dealing with it.
Not clean, not simple, but it works until ST can figure out what’s going on.