Comment 7 for bug 956664

I'll cancel the merge request since you committed the patch instead.