is this a sufficient fix to the problem? I don't think we reached a conclusion in the [bug](https://bugzilla.mozilla.org/show_bug.cgi?id=930279)