Watch deploys a little closer (#4164)

The current thing of returning before it's done makes me so nervous