Followup to bug 99019, part 2. r=neil, a=jcranmer
CLOSED TREE