Comment 3 for bug 354351

This is already fixed on staging and edge because another bug fix indirectly addressed the issue. I will add tests to ensure this does no happen again.