diff --git a/ompi/debuggers/ompi_common_dll.c b/ompi/debuggers/ompi_common_dll.c
index 5e04ea77fc..f8d0969bcc 100644
--- a/ompi/debuggers/ompi_common_dll.c
+++ b/ompi/debuggers/ompi_common_dll.c
@@ -7,6 +7,7 @@
  * Copyright (c) 2012-2013 Inria.  All rights reserved.
  * Copyright (c) 2014      Research Organization for Information Science
  *                         and Technology (RIST). All rights reserved.
+ * Copyright (c) 2014      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -152,12 +153,8 @@ int ompi_fill_in_type_info(mqs_image *image, char **message)
         i_info->opal_hash_table_t.size = mqs_sizeof(qh_type);
         ompi_field_offset(i_info->opal_hash_table_t.offset.ht_table,
                           qh_type, opal_hash_table_t, ht_table);
-        ompi_field_offset(i_info->opal_hash_table_t.offset.ht_table_size,
-                          qh_type, opal_hash_table_t, ht_table_size);
         ompi_field_offset(i_info->opal_hash_table_t.offset.ht_size,
                           qh_type, opal_hash_table_t, ht_size);
-        ompi_field_offset(i_info->opal_hash_table_t.offset.ht_mask,
-                          qh_type, opal_hash_table_t, ht_mask);
     }
     /*
      * Now let's look for all types required for reading the requests.
diff --git a/opal/class/opal_hash_table.h b/opal/class/opal_hash_table.h
index 961597c209..17f50dee31 100644
--- a/opal/class/opal_hash_table.h
+++ b/opal/class/opal_hash_table.h
@@ -13,6 +13,7 @@
  *                         All rights reserved.
  * Copyright (c) 2014-2015 Mellanox Technologies, Inc.
  *                         All rights reserved.
+ * Copyright (c) 2014      Intel, Inc. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -53,11 +54,6 @@ struct opal_hash_table_t
     int                  ht_density_numer, ht_density_denom; /**< max allowed density of table */
     int                  ht_growth_numer, ht_growth_denom;   /**< growth factor when grown  */
     const struct opal_hash_type_methods_t * ht_type_methods;
-    // FIXME
-    // Begin KLUDGE!!  So ompi/debuggers/ompi_common_dll.c doesn't complain
-    size_t              ht_table_size;  /**< size of table */
-    size_t              ht_mask;
-    // End KLUDGE
 };
 typedef struct opal_hash_table_t opal_hash_table_t;