Remove new patch #3258

d.o is being unreliable, so let's not introduce new patches yet.