Backport Mozilla Bug 1658881