diff --git a/orte/tools/orterun/orterun.c b/orte/tools/orterun/orterun.c
index 4cb9a310a0..f5a56d8dd5 100644
--- a/orte/tools/orterun/orterun.c
+++ b/orte/tools/orterun/orterun.c
@@ -964,19 +964,14 @@ static int create_app(int argc, char* argv[], orte_app_context_t **app_ptr,
         }
 #endif
 
-#if 0
-        /* JMS commented out because we don't handle this in any
-           mapper */
         /* Save -host args */
-
-        else if (0 == strcmp("-host", argv[i])) {
+        else if (0 == strcmp("-host", argv[i]) || 0 == strcmp("-H", argv[i])) {
             char str[2] = { '0' + ORTE_APP_CONTEXT_MAP_HOSTNAME, '\0' };
 
             opal_argv_append(&new_argc, &new_argv, "-rawmap");
             opal_argv_append(&new_argc, &new_argv, str);
             save_arg = false;
         }
-#endif
 
         /* If this token was C/N map data, save it */