Comment 5 for bug 1573577

I've proposed a branch (first time, sorry if I did something wrong) and created a pull request upstream. Don't have much hope with the activity upstream has seen, though.