Fixup to 035cbcd.