I have a PR up here that should work for PG13 as well.
We’re still considering how realistic this case is in the wild, and how much we should potentially invest in working around it.