Revert accidental watch change from 78497c0

Fixes #2550.