Comment 25 for bug 322314

Updating: I submitted a second patch to upstream. Hope it accepts it :)