Comment 15 for bug 1397095

Thaddaeus Tintenfisch' patch works perfectly for me.
But it is neither committed to git nor released.