Removed diffs that are handled upstream now