Fixup for bug 913842. r=me