revert fix which doesn't work with OpenMPI..