working on it as part of https://bugzilla.mozilla.org/show_bug.cgi?id=943504