Revert "Changed multicast setup algo"

This reverts commit 892cb5020c22e7789bd5462185819e705e7fe2e5.