watcher: really fix hostname stuff

Commit 0ec59be was incomplete (sorry)