Comment 5 for bug 1962035

I finally had more than 20 seconds to look at this, commented in the upstream PR with a line that would be great to be added to match one common case that I think isn't covered yet.