Fixes repeated node down/up on same node.

Change-Id: I5d65364ebece1e901f6a05f95ee5fbfdf5829185
Merge "Fixes repeated node down/up on same node."