Backport patch for
#24056
https://bugzilla.mozilla.org/show_bug.cgi?id=1561322