BZ-11708: use the location object that came through the watcher