bug fix release: reverting to watchFile to guarantee correct behaviour while fixing the concurrency issue with watch