Redo fix.
#a5d388f on 7.x-1.x by itarato: #2238715 by garnett2125: Error when deleting a node.