diff --git a/opal/mca/db/pmi/db_pmi.c b/opal/mca/db/pmi/db_pmi.c
index c0ac237975..c70949f102 100644
--- a/opal/mca/db/pmi/db_pmi.c
+++ b/opal/mca/db/pmi/db_pmi.c
@@ -586,15 +586,10 @@ static int setup_pmi(void)
     }
 #endif
 
-#if WANT_PMI2_SUPPORT
-    /* TODO -- is this ok */
-    max_length = 1024;
-#else
     if (PMI_SUCCESS != (rc = PMI_KVS_Get_name_length_max(&max_length))) {
         OPAL_PMI_ERROR(rc, "PMI_KVS_Get_name_length_max");
         return OPAL_ERROR;
     }
-#endif
     pmi_kvs_name = (char*)malloc(max_length);
     if (NULL == pmi_kvs_name) {
         return OPAL_ERR_OUT_OF_RESOURCE;