Port the watch method to use the v2 api, since v1 watch is broken in 0.3+