Fixup for 7045862f