Followup to bug 871350 to fix test failure (bug 871391) from incomplete merge. r=me