Change that should conflict with upstream changes (for now)


Upstreamed from https://bugzilla.mozilla.org/show_bug.cgi?id=1102907