Fix breakage caused by changes in bug 967364, r=me