@fgeorgatos: please don't include patches that are not used (and shouldn't be used, since they're site-specific)