Comment 4 for bug 1630413

Core from previous comment.