This with (softly) clash with PR for https://bugzilla.mozilla.org/show_bug.cgi?id=700599
We just need to keep this in mind when we merge this or the other PR.