diff --git a/orte/mca/rmaps/base/rmaps_base_support_fns.c b/orte/mca/rmaps/base/rmaps_base_support_fns.c
index 392a50e372..73ffaeb34d 100644
--- a/orte/mca/rmaps/base/rmaps_base_support_fns.c
+++ b/orte/mca/rmaps/base/rmaps_base_support_fns.c
@@ -218,19 +218,13 @@ int orte_rmaps_base_get_target_nodes(opal_list_t *allocated_nodes, orte_std_cntr
                 goto addknown;
             }
         } else {
-            /* if nothing else was available, then use the local host */
+            /* if nothing else was available, then use all known nodes, which
+             * will include ourselves
+             */
             OPAL_OUTPUT_VERBOSE((5, orte_rmaps_base_framework.framework_output,
-                                 "%s using local host",
+                                 "%s using known nodes",
                                  ORTE_NAME_PRINT(ORTE_PROC_MY_NAME)));
-            node = (orte_node_t*)opal_pointer_array_get_item(orte_node_pool, 0);
-            OBJ_RETAIN(node);
-            opal_list_append(allocated_nodes, &node->super);
-            OBJ_DESTRUCT(&nodes);
-            if (initial_map) {
-                /* mark the node as not in the map */
-                node->mapped = false;
-            }
-            goto complete;
+            goto addknown;
         }
         /** if we still don't have anything */
         if (0 == opal_list_get_size(&nodes)) {