Reverted commit a14eab01d5090296f37a442bea0eec39fc67268d, because it breaks the MPI wrapper.