Merge "Ditch support for original wikidiff"