Add unwatch to actual stream ensure instead of just the heartbeat.