Fixes the branch. It should work now without MPI.
Commit for the sake of convenience. Still broken.