Remove previously renumbered patch left over from upstream merge