Fixup for 7c3d81fa