Revert "fixes zeromq#829"

This reverts commit d4da358.

Author: amichel

src/NetMQ.sln.DotSettings

@@ -8,9 +8,6 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="m_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /&gt;</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticReadonly/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="s_" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>

src/NetMQ/ISocketPollableCollection.cs

@@ -1,4 +1,3 @@
-using System;
 using JetBrains.Annotations;
 using NetMQ.Monitoring;
 
@@ -14,6 +13,5 @@ public interface ISocketPollableCollection
     {
         void Add([NotNull] ISocketPollable socket);
         void Remove([NotNull] ISocketPollable socket);
-        void RemoveAndDispose<T>(T socket) where T : ISocketPollable, IDisposable;
     }
 }

src/NetMQ/Monitoring/NetMQMonitor.cs

@@ -24,7 +24,7 @@ public class NetMQMonitor : IDisposable
     {
         [NotNull] private readonly NetMQSocket m_monitoringSocket;
         private readonly bool m_ownsMonitoringSocket;
-        [CanBeNull] private ISocketPollableCollection m_attachedPoller;
+        [CanBeNull] private NetMQPoller m_attachedPoller;
         private int m_cancel;
 
         private readonly ManualResetEvent m_isStoppedEvent = new ManualResetEvent(true);
@@ -208,15 +208,15 @@ private void InternalClose()
                 m_monitoringSocket.Disconnect(Endpoint);
             }
             catch (Exception)
-            { }
+            {}
             finally
             {
                 IsRunning = false;
                 m_isStoppedEvent.Set();
             }
         }
 
-        public void AttachToPoller<T>(T poller) where T : ISocketPollableCollection
+        public void AttachToPoller([NotNull] NetMQPoller poller)
         {
             if (poller == null)
                 throw new ArgumentNullException(nameof(poller));
@@ -233,12 +233,12 @@ public void DetachFromPoller()
         {
             DetachFromPoller(false);
         }
-
+        
         private void DetachFromPoller(bool dispose)
         {
             if (m_attachedPoller == null)
                 throw new InvalidOperationException("Not attached to a poller");
-
+            
             if (dispose)
                 m_attachedPoller.RemoveAndDispose(m_monitoringSocket);
             else
@@ -324,7 +324,7 @@ protected virtual void Dispose(bool disposing)
             if (!disposing)
                 return;
 
-            bool attachedToPoller = m_attachedPoller != null;
+            bool attachedToPoller = m_attachedPoller != null; 
 
             if (attachedToPoller)
             {