[upstream] Remove unneeded patch