Decouple removing the fileWatcher from reading Upstream-commit: 0cdcb9ea7350b1e0a024bf40c8cf60e541f2c69f Component: engine