diff --git a/orte/dss/dss_open_close.c b/orte/dss/dss_open_close.c
index dfcdb62cf2..1de35f7f75 100644
--- a/orte/dss/dss_open_close.c
+++ b/orte/dss/dss_open_close.c
@@ -164,7 +164,9 @@ int orte_dss_open(void)
 #if OMPI_ENABLE_DEBUG
     def_type = ORTE_DSS_BUFFER_FULLY_DESC;
 #else
-    def_type = ORTE_DSS_BUFFER_NON_DESC;
+    /* BWB - temporarily disable non-described until we get the kinks worked out... */
+    /* def_type = ORTE_DSS_BUFFER_NON_DESC; */
+    def_type = ORTE_DSS_BUFFER_FULLY_DESC;
 #endif
 
     id = mca_base_param_register_int("dss", "buffer", "type",