Fixup to 5abca46.