revert surface watcher changes by hef