Fixup for a193b0a9