Drop the stupid patch infrastructure and merge patches into contrib.