Re-enable MPI/PCI code