Comment 15 for bug 1890230

I have provided what I think will resolve your issue, since it is optional and not hurting anybody else this is fine.
But without further engagement and verification of that I can not consider backports to e.g. focal right now.