Hand edit the diff to remove things not needed