generic: 6.1: fix list_count_nodes backport patch