For info, two accounts were working together here.  I've reverted the other one in https://www.openstreetmap.org/changeset/166163077 and have forced through the remaining reverts in https://www.openstreetmap.org/changeset/166163147 