diff --git a/src/mesa/state_tracker/st_debug.c b/src/mesa/state_tracker/st_debug.c
index 711af37a339..4505d2b8e10 100644
--- a/src/mesa/state_tracker/st_debug.c
+++ b/src/mesa/state_tracker/st_debug.c
@@ -68,9 +68,7 @@ DEBUG_GET_ONCE_FLAGS_OPTION(st_debug, "ST_DEBUG", st_debug_flags, 0)
 void
 st_debug_init(void)
 {
-   do_once {
-      ST_DEBUG = debug_get_option_st_debug();
-   }
+   ST_DEBUG = debug_get_option_st_debug();
 }
 
 
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index 68c9487a848..81d3000be1e 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -1040,8 +1040,6 @@ void st_init_extensions(struct pipe_screen *screen,
         } },
    };
 
-   st_debug_init();
-
    /*
     * Extensions that are supported by all Gallium drivers:
     */