Index: firmware/target/arm/as3525/sd-as3525v2.c
===================================================================
--- firmware/target/arm/as3525/sd-as3525v2.c	(revision 29666)
+++ firmware/target/arm/as3525/sd-as3525v2.c	(working copy)
@@ -432,16 +432,6 @@
       /*b23     | CMD_CCS_EXPECTED        unused  */
       /*b31 */  |                                      CMD_DONE_BIT;
 
-#if defined(SANSA_FUZEV2)
-    if (amsv2_variant == 0)
-    {
-        extern int buttonlight_is_on;
-        if(buttonlight_is_on)
-            _buttonlight_on();
-        else
-            _buttonlight_off();
-    }
-#endif
     semaphore_wait(&command_completion_signal, TIMEOUT_BLOCK);
 
     /*  Handle command responses & errors */
Index: firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c
===================================================================
--- firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c	(revision 29666)
+++ firmware/target/arm/as3525/sansa-fuzev2/backlight-fuzev2.c	(working copy)
@@ -26,8 +26,6 @@
 #include "ascodec-target.h"
 #include "as3514.h"
 
-int buttonlight_is_on = 0;
-
 void _backlight_set_brightness(int brightness)
 {
     ascodec_write_pmu(AS3543_BACKLIGHT, 2, brightness * 10);
@@ -39,8 +37,14 @@
     ascodec_write_pmu(AS3543_BACKLIGHT, 2, backlight_brightness * 10);
 
     /* needed for button light */
-    if (amsv2_variant == 1)
+    if (amsv2_variant == 0)
+    {
+        GPIOB_DIR |= 1<<5;
+    }
+    else
+    {
         ascodec_write_pmu(0x1a, 1, 0x30);   /* MUX_PWGD = PWM */
+    }
 
     return true;
 }
@@ -65,9 +69,7 @@
 {
     if (amsv2_variant == 0)
     {
-        GPIOB_DIR |= 1<<5;
         GPIOB_PIN(5) = (1<<5);
-        buttonlight_is_on = 1;
     }
     else
     {
@@ -80,8 +82,6 @@
     if (amsv2_variant == 0)
     {
         GPIOB_PIN(5) = 0;
-        GPIOB_DIR &= ~(1<<5);
-        buttonlight_is_on = 0;
     }
     else
     {