Drop unused patch block and re-enable enable-mpi-thread-multiple.

The patches aren't needed any longer.
Re-enable enable-mpi-thread-multiple, it was a site local change that
shouldn't have been there in the first place.