Upstream integrated #4740.  Delete that patch.  Modified is unchanged.