Undo some changes to the distribution layer to make MPI work again.