Reverted bad multicast implementation

Fixed source addresses