Trying to make MPI optional again...