Revert "Fixes #3674: change the index to index node, execution timestamp"

This reverts commit 40ed6ddbee92b6a42eaf667b8077b10005c85f84.