Comment 5 for bug 2044146

Yes, sorry for the confusion. Patch from #2052528 already accounts for this issue and the commit you've listed should be enough to resolve it as well.

So, I suppose, nothing else should be done here.