#819793 c-n-f: uses ancient c_n_f_handle as c_n_f_handler