Fixup for bug 860246 because of conflict with bug 789373. r=hwine