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

This fixes https://bugzilla.mozilla.org/show_bug.cgi?id=1103326