Adapt d/watch to stable version only (0.7.X)