Index: trunk/src/board.c
===================================================================
--- trunk/src/board.c	(revision 8602)
+++ trunk/src/board.c	(revision 8603)
@@ -73,7 +73,6 @@
 
 	ptr->ThermStyle = 4;
 	ptr->IsleArea = 2.e8;
-	ptr->SilkActive = pcb_false;
 	ptr->RatDraw = pcb_false;
 
 	/* NOTE: we used to set all the pcb flags on ptr here, but we don't need to do that anymore due to the new conf system */
Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 8602)
+++ trunk/src/board.h	(revision 8603)
@@ -70,7 +70,7 @@
 	  ThermStyle;									/* type of thermal to place with thermal tool */
 	pcb_bool Changed,									/* layout has been changed */
 	  ViaOn,											/* visibility flags */
-	  RatOn, InvisibleObjectsOn, PinOn, SilkActive,	/* active layer is actually silk */
+	  RatOn, InvisibleObjectsOn, PinOn,	/* active layer is actually silk */
 	  RatDraw;										/* we're drawing rats */
 	pcb_coord_t CursorX,									/* cursor position as saved with layout */
 	  CursorY;
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 8602)
+++ trunk/src/layer.h	(revision 8603)
@@ -137,12 +137,8 @@
 
 #define	LAYER_ON_STACK(n)	(&PCB->Data->Layer[pcb_layer_stack[(n)]])
 #define LAYER_PTR(n)            (&PCB->Data->Layer[(n)])
-#define	CURRENT			(PCB->SilkActive ? &PCB->Data->Layer[ \
-				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk())] \
-				: LAYER_ON_STACK(0))
-#define	INDEXOFCURRENT		(PCB->SilkActive ? \
-				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk()) \
-				: pcb_layer_stack[0])
+#define	CURRENT	(LAYER_ON_STACK(0))
+#define	INDEXOFCURRENT	(pcb_layer_stack[0])
 #define SILKLAYER		Layer[ \
 				(conf_core.editor.show_solder_side ? pcb_layer_get_bottom_silk() : pcb_layer_get_top_silk())]
 #define BACKSILKLAYER		Layer[ \
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 8602)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 8603)
@@ -117,8 +117,6 @@
 
 	if (PCB->RatDraw)
 		current_layer = LB_RATS;
-	else if (PCB->SilkActive)
-		current_layer = LB_SILK;
 	else
 		current_layer = pcb_layer_stack[0];
 
@@ -281,7 +279,6 @@
 	int l, i;
 	const char *name;
 	PCB->RatDraw = (layer == LB_RATS);
-	PCB->SilkActive = (layer == LB_SILK);
 	if ((layer < pcb_max_layer) && (!(pcb_layer_flags(PCB, layer) & PCB_LYT_SILK)))
 		pcb_layervis_change_group_vis(layer, 1, 1);
 	for (l = 0; l < num_layer_buttons; l++) {