I reverted all the changesets around Waterloo and Guelph in https://www.openstreetmap.org/changeset/134422424 (I waited far too long to do so, was a bit of a mess but I think it worked out okay.) If anyone wants me to revert any of the other changesets in other areas the DWG didn't handle, let me know.