Fixup for 2310c09