Fix merge r65567.