Unsubscribe from watched builders during stop so reconfigure works corre...

...ctly