fix breakage caused by previous checkins.