Remove patch for upstream merge