Revert multicast pull request 212