Remove remaining calls to as_local_node_id
#72750
+50
−43
Merged