Comment 5 for bug 1755507

Hi Sandor, I think this is a candidate for backporting. I see 1chb1n changed the milestone to target this fix against 18.05, I'll catch up with him in a few hours and see if backporting to stable is still an option.