diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
index e72455854..3dd76b1a7 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.check_backend
@@ -18,7 +18,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera b/maxscale-system-test/cnf/maxscale.cnf.template.galera
index 70c459d96..d8654e688 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera
@@ -8,7 +8,7 @@ servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681 b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
index 8aa84b597..938111b73 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.bug681
@@ -10,7 +10,7 @@ servers=server1,server2,server3
 #passwd=maxpwd
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
index 711280809..773433c4d 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera.weight
@@ -9,7 +9,7 @@ servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
 use_priority=true
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564 b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
index 7e76297a7..292d6b7fe 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_mxs564
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
index d6185ac5a..88d5bfe31 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.galera_priority
@@ -12,7 +12,7 @@ user=maxskysql
 passwd=skysql
 use_priority=true
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
index ec9d0a23f..5002f8c5f 100644
--- a/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.java_prep_stmt
@@ -10,7 +10,7 @@ servers= server1, server2,server3  ,server4
 user=maxskysql
 passwd= skysql
 monitor_interval=1000
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
index 728470d45..c68d8cdea 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
index b77eb01c5..0087b964a 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers1
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10 b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
index bae8ae3e9..553ed8cb6 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.load_galera_pers10
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
index 125abd596..482e34a75 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs118
@@ -16,7 +16,7 @@ module=galeramon
 servers= server1, server2,server3  ,server4
 user=maxskysql
 passwd= skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361 b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
index afa385e01..8f85d4b8a 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.mxs361
@@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=100
-#root_node_as_master=false
+root_node_as_master=false
 
 [server1]
 type=server
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01 b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
index 444d53d0d..df4e68712 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.pers_01
@@ -86,7 +86,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 user=maxskysql
 passwd=skysql
 monitor_interval=100
-#root_node_as_master=false
+root_node_as_master=false
 
 [server1]
 type=server
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.script b/maxscale-system-test/cnf/maxscale.cnf.template.script
index aec3533de..026748347 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.script
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.script
@@ -20,7 +20,7 @@ servers=gserver1,gserver2,gserver3,gserver4
 script=/###access_homedir###/script/script.sh  --event=$EVENT --initiator=$INITIATOR --nodelist=$NODELIST
 events=master_down,master_up, slave_up,   server_down  ,server_up,lost_master,lost_slave,new_master,new_slave,server_down,server_up,synced_down,synced_up
 disable_master_role_setting=true
-#root_node_as_master=false
+root_node_as_master=false
 user=maxskysql
 passwd=skysql
 monitor_interval=1000
diff --git a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
index aaef97c64..477816318 100755
--- a/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
+++ b/maxscale-system-test/cnf/maxscale.cnf.template.ssl_load_galera
@@ -8,7 +8,7 @@ module=galeramon
 servers=server1,server2,server3,server4
 user=maxskysql
 passwd=skysql
-#root_node_as_master=false
+root_node_as_master=false
 
 [RW Split Router]
 type=service