20121207 city.surat: Conflict diamond definition won't change