Index: tools/config.py
===================================================================
--- tools/config.py	(revision c0bd08d13ec5f4a113b4a8f25fbbb456b69a1cd2)
+++ tools/config.py	(revision c01f8e6569d3ccfbdad77b7dfc725604ca76fece)
@@ -572,9 +572,4 @@
 					value = default
 					config[varname] = default
-
-				if value == None:
-					if default == None:
-						value = default
-					config[varname] = value
 				
 				option = get_rule_option(rule, value)