fixup! Filed bug 969381