Undo watcher class change