Fixup for c921d696