Fixup for a75f0522