didn't want to mess too much with the code, so opened a new bug for this https://bugzilla.mozilla.org/show_bug.cgi?id=985389