From be52ee76a00e867ea9039a65c08dca4555490725 Mon Sep 17 00:00:00 2001
From: "Jeppe N. Odgaard" <jeppenodgaard@gmail.com>
Date: Thu, 15 Nov 2018 16:40:30 +0100
Subject: [PATCH] Reverted changes to examples/multicast

---
 examples/multicast/Makefile | 5 -----
 examples/multicast/root.c   | 4 ++--
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/examples/multicast/Makefile b/examples/multicast/Makefile
index be7fb6422..86c16e481 100644
--- a/examples/multicast/Makefile
+++ b/examples/multicast/Makefile
@@ -12,11 +12,6 @@ include $(CONTIKI)/Makefile.identify-target
 MODULES_REL += $(TARGET)
 
 MODULES += os/net/ipv6/multicast
-MODULES += os/services/shell
-
-ifeq ($(DISABLE_AUTO_ROOT),1)
-	CFLAGS += -DDISABLE_AUTO_ROOT
-endif
 
 MAKE_ROUTING = MAKE_ROUTING_RPL_CLASSIC
 include $(CONTIKI)/Makefile.include
diff --git a/examples/multicast/root.c b/examples/multicast/root.c
index a95a25bcf..59d5d2aa8 100644
--- a/examples/multicast/root.c
+++ b/examples/multicast/root.c
@@ -111,9 +111,9 @@ PROCESS_THREAD(rpl_root_process, ev, data)
   PROCESS_BEGIN();
 
   PRINTF("Multicast Engine: '%s'\n", UIP_MCAST6.name);
-#ifndef DISABLE_AUTO_ROOT
+
   NETSTACK_ROUTING.root_start();
-#endif
+
   prepare_mcast();
 
   etimer_set(&et, START_DELAY * CLOCK_SECOND);