Comment 12 for bug 1596119

Can we get this patch back-ported to Mitaka as well?