r65299 c5894 followup