Comment 9 for bug 1287341

I already have a prototype that solves the use case mentioned in this bug report.

Apparently upstream also has code that fixes the same issue and covers more use cases. It doesn't seem like a small amount of code though. For this reason I'll take some time to see if a backport is possible or recommended over using my current implementation.