Restore old "watch" behavior