Comment 1 for bug 939828

Just because, attaching the patch here as well (though it's been submitted with the bug upstream).