Fixup earlier commit r4655