Fixed merge error in the previous checkin.