The watch for the root directory is removed properly during a changeover now.