Fix f860e0bd Firefox failures