Fix merge error for my previous checkin.