Fixup for c8285b8