Fixup for fc9a4eaf