Comment 38 for bug 1362046

So finally I figured everything out and made this patch for you (and me) folks!
Enjoy it and use at your own risk.
I hope this gets supervised and finds it's way to downstream and upstream...