Consider backporting fix for crash in originattributes

https://bugzilla.mozilla.org/show_bug.cgi?id=1470156