Fixup for bug 852103. r=me