Comment 14 for bug 838994

Created attachment 25202
Candidate patch