Change to use event_stream from pub.