Revert "[#PRX-250 Possible race condition for receiving n-event-rsp ]"

This reverts commit 475bdbc635d1d1c5c9cdc3e566da0d609bc64b8c.