Revert "bug fix for configuring mvapich2"

This reverts commit 519ec0db9fd63858924cabe62824b650a68875a4.