Fixup for be84e607