Index: config/opal_configure_options.m4
===================================================================
--- config/opal_configure_options.m4	(revision 27959)
+++ config/opal_configure_options.m4	(working copy)
@@ -10,7 +10,7 @@
 dnl                         University of Stuttgart.  All rights reserved.
 dnl Copyright (c) 2004-2005 The Regents of the University of California.
 dnl                         All rights reserved.
-dnl Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
 dnl Copyright (c) 2007      Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2009      IBM Corporation.  All rights reserved.
 dnl Copyright (c) 2009      Los Alamos National Security, LLC.  All rights
@@ -284,18 +284,10 @@
 # Heterogeneous support
 #
 
-AC_MSG_CHECKING([if want heterogeneous support])
-AC_ARG_ENABLE([heterogeneous],
-    [AC_HELP_STRING([--enable-heterogeneous],
-                    [Enable features required for heterogeneous
-                     platform support (default: disabled)])])
-if test "$enable_heterogeneous" = "yes" ; then
-     AC_MSG_RESULT([yes])
-     ompi_want_heterogeneous=1
-else
-     AC_MSG_RESULT([no])
-     ompi_want_heterogeneous=0
-fi
+# Heterogeneous support is currently broken and therefore disabled so
+# that a user doesn't try to use it.  If it is ever fixed, the
+# ARG_ENABLE for it can be put back.
+ompi_want_heterogeneous=0
 AC_DEFINE_UNQUOTED([OPAL_ENABLE_HETEROGENEOUS_SUPPORT], 
                    [$ompi_want_heterogeneous], 
                    [Enable features required for heterogeneous support])
Index: README
===================================================================
--- README	(revision 27959)
+++ README	(working copy)
@@ -8,7 +8,7 @@
                         University of Stuttgart.  All rights reserved.
 Copyright (c) 2004-2007 The Regents of the University of California.
                         All rights reserved.
-Copyright (c) 2006-2012 Cisco Systems, Inc.  All rights reserved.
+Copyright (c) 2006-2013 Cisco Systems, Inc.  All rights reserved.
 Copyright (c) 2006-2011 Mellanox Technologies. All rights reserved.
 Copyright (c) 2006-2012 Oracle and/or its affiliates.  All rights reserved.
 Copyright (c) 2007      Myricom, Inc.  All rights reserved.
@@ -1132,11 +1132,6 @@
 --enable-peruse 
   Enable the PERUSE MPI data analysis interface.
 
---enable-heterogeneous
-  Enable support for running on heterogeneous clusters (e.g., machines
-  with different endian representations).  Heterogeneous support is
-  disabled by default because it imposes a minor performance penalty.
-
 --with-wrapper-cflags=<cflags>
 --with-wrapper-cxxflags=<cxxflags>
 --with-wrapper-fflags=<fflags>