Fixup for 628450d