Remove patch that has been applied upstream