Comment 1 for bug 616737

Attaching a copy of my patch from the Gnome bugzilla