This reverts commit ab29a9cd.
The name watch was correct in the first place. This also reverts the two cleanup attempts f9e7de0f and 8b6bc5b7.