I forgot to remove the obsolete patches here. I've made that change in
my local tree.