Fixup for 4c17b45.
Fixup for cb9b9be.