BZ-1031751: Node deregistering fix.