Merge the deletions from R-3.0.2 too