Revert "Fix heterogeneous support"

Per the discussion at http://www.open-mpi.org/community/lists/devel/2014/10/16050.php

This reverts commit c9c5d4011bf6ea1ade1a5bd9b6a77f02157dc774.