Fix typo after manual merge in last checkin.