Don't unsubscribe, there is no need to and it leaves zeromq

in the wrong state for a few moments and breaks the client

salt/client.py

@@ -207,10 +207,7 @@ class LocalClient(object):
             timeout=self._get_timeout(timeout),
             **kwargs)
 
-        try:
         return self._check_pub_data(pub_data)
-        finally:
-            self.event.unsubscribe(jid)
 
     def cmd_async(
         self,

salt/utils/event.py

@@ -147,7 +147,6 @@ class SaltEvent(object):
         wait = wait * 1000
 
         self.subscribe(tag)
-        try:
         while True:
             socks = dict(self.poller.poll(wait))
             if self.sub in socks and socks[self.sub] == zmq.POLLIN:
@@ -162,9 +161,6 @@ class SaltEvent(object):
                     return ret
                 return data
             return None
-        finally:
-            # No sense in keeping subscribed to this event
-            self.unsubscribe(tag)
 
     def iter_events(self, tag='', full=False):
         '''