diff --git a/opal/mca/hwloc/configure.m4 b/opal/mca/hwloc/configure.m4
index f56f947c8fb..64a24d318f5 100644
--- a/opal/mca/hwloc/configure.m4
+++ b/opal/mca/hwloc/configure.m4
@@ -89,9 +89,6 @@ AC_DEFUN([MCA_opal_hwloc_CONFIG_REQUIRE],[
     # REQUIRE.
     MCA_CONFIGURE_FRAMEWORK([opal], [hwloc], 1)
 
-    # Restore the --enable-pci flag
-    enable_pci=$opal_hwloc_hwloc132_save_enable_pci
-
     # Give a blank line to separate these messages from the last
     # component's configure.m4 output.
     echo " "
diff --git a/opal/mca/hwloc/external/configure.m4 b/opal/mca/hwloc/external/configure.m4
index 5036a0bd8ae..350a444fe31 100644
--- a/opal/mca/hwloc/external/configure.m4
+++ b/opal/mca/hwloc/external/configure.m4
@@ -173,18 +173,6 @@ AC_DEFUN([MCA_opal_hwloc_external_CONFIG],[
                   AC_CHECK_DECLS([HWLOC_OBJ_OSDEV_COPROC], [], [], [#include <hwloc.h>])
                   AC_CHECK_FUNCS([hwloc_topology_dup])
 
-                  # See if the external hwloc supports XML
-                  AC_MSG_CHECKING([if external hwloc supports XML])
-                  AS_IF([test "$opal_hwloc_dir" != ""],
-                        [opal_hwloc_external_lstopo="$opal_hwloc_dir/bin/lstopo"],
-                        [OPAL_WHICH(lstopo, opal_hwloc_external_lstopo)])
-                  opal_hwloc_external_tmp=`$opal_hwloc_external_lstopo --help | $GREP "Supported output file formats" | grep xml`
-                  AS_IF([test "$opal_hwloc_external_tmp" = ""],
-                        [opal_hwloc_external_enable_xml=0
-                         AC_MSG_RESULT([no])],
-                        [opal_hwloc_external_enable_xml=1
-                         AC_MSG_RESULT([yes])])
-
                   AC_CHECK_HEADERS([infiniband/verbs.h])
 
                   # These flags need to get passed to the wrapper compilers
diff --git a/opal/mca/hwloc/external/external.h b/opal/mca/hwloc/external/external.h
index 8a1a32068ba..2d586fbbe85 100644
--- a/opal/mca/hwloc/external/external.h
+++ b/opal/mca/hwloc/external/external.h
@@ -56,7 +56,7 @@ BEGIN_C_DECLS
 #    if defined(HAVE_INFINIBAND_VERBS_H)
 #        include MCA_hwloc_external_openfabrics_header
 #    else
-#        error Tried to include hwloc verbs helper file, but hwloc was compiled with no OpenFabrics support
+#        error Tried to include hwloc verbs helper file, but <infiniband/verbs.h> is missing
 #    endif
 #endif
 
diff --git a/opal/mca/hwloc/hwloc2/hwloc2.h b/opal/mca/hwloc/hwloc2/hwloc2.h
index e27e85b6d8e..ffb5a93266c 100644
--- a/opal/mca/hwloc/hwloc2/hwloc2.h
+++ b/opal/mca/hwloc/hwloc2/hwloc2.h
@@ -42,7 +42,7 @@ BEGIN_C_DECLS
 #    if defined(HAVE_INFINIBAND_VERBS_H)
 #        include "hwloc/include/hwloc/openfabrics-verbs.h"
 #    else
-#        error Tried to include hwloc verbs helper file, but hwloc was compiled with no OpenFabrics support
+#        error Tried to include hwloc verbs helper file, but <infiniband/verbs.h> is missing
 #    endif
 #endif