remove watch since it default in 2.4.0
Merge pull request #2922 from igas/patch-1