reworked patch as per https://bugzilla.mozilla.org/show_bug.cgi?id=10389...

...92#c12 r=_6a68