Starting to add membership management messages.
diff --git a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
index 647690e..d4b7289 100644
--- a/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
+++ b/core/store/dist/src/main/java/org/onlab/onos/store/cluster/impl/DistributedClusterStore.java
@@ -128,10 +128,11 @@
     @Override
     public void removeNode(NodeId nodeId) {
         if (nodeId.equals(localNode.id())) {
-            // FIXME: this is still broken
             // We are being ejected from the cluster, so remove all other nodes.
             communicationAdminService.clearAllNodesAndStreams();
             nodes.clear();
+            nodes.put(localNode.id(), localNode);
+
         } else {
             // Remove the other node.
             DefaultControllerNode node = nodes.remove(nodeId);
@@ -152,6 +153,7 @@
             states.put(nodeId, State.ACTIVE);
             return node;
         }
+
         @Override
         public void nodeVanished(NodeId nodeId) {
             states.put(nodeId, State.INACTIVE);