This reverts commit cb55c88a8b7817d5891ff06a447ea190b0e77479.
Signed-off-by: Ralph Castain <rhc@open-mpi.org>