Backport bugzilla 1561636 for 26514
We can backport https://hg.mozilla.org/mozilla-central/rev/98a5a4864b88 and drop the patch for #26514 (moved).
We can backport https://hg.mozilla.org/mozilla-central/rev/98a5a4864b88 and drop the patch for #26514 (moved).