Add a comment to indicate that the patch is upstream an can be removed in next release.