This reverts commit 23953cfa5a. 01837 seems to be having multiple issues, one being broken multicast so lets revert to the last version that was better for the stable branch. Signed-off-by: Robert Marko <robimarko@gmail.com>
23953cfa5a