Fixup for e9a3f89a