Fixup for 599e424d