Revert "Remove entries already handled by node"

This reverts commit 1c4939836409f9a895fcc589212baf4ace24f01e.