diff --git a/conf/local.conf b/conf/local.conf
index 14933efff..7ee37c2c6 100644
--- a/conf/local.conf
+++ b/conf/local.conf
@@ -43,14 +43,6 @@ MIRRORS_append = "\
     http://.*/.* http://sources.bec-systems.com/ \n \
     https://.*/.* http://sources.bec-systems.com/ \n"
 
-
-# enable systemd
-
-DISTRO_FEATURES_append = " systemd"
-DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
-VIRTUAL-RUNTIME_init_manager = "systemd"
-VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
-
 # Dont package kernel into image
 RDEPENDS_kernel-base = ""
 
diff --git a/conf/locallocal.conf.sample b/conf/locallocal.conf.sample
index 2d1ff437e..0c4c00a99 100644
--- a/conf/locallocal.conf.sample
+++ b/conf/locallocal.conf.sample
@@ -4,6 +4,9 @@
 # required for Freescale stuff to build
 ACCEPT_FSL_EULA = "1"
 
+# required for Qualcomm stuff to build
+ACCEPT_EULA = "1"
+
 # required to build netperf
 LICENSE_FLAGS_WHITELIST = "non-commercial"