Is this still needed since https://bugzilla.mozilla.org/show_bug.cgi?id=939773 landed?