Comment 8 for bug 1818142

A patch, for discussion.