Comment 4 for bug 1564378

I have confirmed this behavior on 2.9 and master.

I'll have a look at the branch tomorrow morning and load it for testing.

As mentioned above, it looks like a straightforward change.