Refresh for 3.13-rc4.
Drop unneeded patches.