fix ext_nodes breakage
Revert _ext_nodes change.
Make code tiny bit clearer, fix pylint.
Merge pull request #13686 from cro/ext_nodes_fail2

Fix ext_nodes breakage