Fixup to c6c6a30.