diff --git a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java b/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java
index 1533c48c383adfb858a60c135d4ba3b4ad49118a..03bccfdeed52bb02a6b1a5fd51b8012edac5b197 100644
--- a/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java
+++ b/processing/src/main/java/io/druid/query/select/SelectQueryQueryToolChest.java
@@ -170,10 +170,9 @@ public class SelectQueryQueryToolChest extends QueryToolChest<Result<SelectResul
           ++index;
         }
 
-
         final Set<String> metrics = Sets.newTreeSet();
         if (query.getMetrics() != null) {
-          dimensions.addAll(query.getMetrics());
+          metrics.addAll(query.getMetrics());
         }
 
         final byte[][] metricBytes = new byte[metrics.size()][];
diff --git a/server/src/main/java/io/druid/curator/announcement/Announcer.java b/server/src/main/java/io/druid/curator/announcement/Announcer.java
index f9ff444bf5e7ddb621701efbb57d9e3d24457e9b..99393a7af34801d67b81a3ec07c74de8b9e07ddf 100644
--- a/server/src/main/java/io/druid/curator/announcement/Announcer.java
+++ b/server/src/main/java/io/druid/curator/announcement/Announcer.java
@@ -212,11 +212,6 @@ public class Announcer
                         pathsToReinstate.add(path);
                       }
 
-                      for (ChildData data : cache.getCurrentData()) {
-                        log.info("Node[%s] in cache is removed to reinstate.", data.getPath());
-                        pathsToReinstate.remove(data.getPath());
-                      }
-
                       if (!pathsToReinstate.isEmpty() && !pathsLost.compareAndSet(null, pathsToReinstate)) {
                         log.info("Already had a pathsLost set!?[%s]", parentPath);
                       }