Revert "Use node with index attribute instead of node-#"

This reverts commit 5a0a8b748436c7ee6a67f631c23a745f9b610894.