Fixup for f13cf1d2