Fixup to 7b12cd4.