Revert "igmp changes"

This reverts commit 2b0a6c2c1100a3f9795ef064e30c89a9fd8ea496.