Follow to changes tintroduced by https://bugzilla.mozilla.org/show_bug.cgi?id=930901