diff --git a/strongarm.module b/strongarm.module
index 990d4c9..3d60625 100644
--- a/strongarm.module
+++ b/strongarm.module
@@ -1,19 +1,13 @@
 <?php
 
 /**
- * Implements hook_init().
+ * Implements hook_stream_wrappers().
+ *
+ * This is ugly but very effective. hook_stream_wrappers is early invoked even before
+ * drupal_path_initialize and resolves various other issues.
  */
-function strongarm_init() {
+function strongarm_stream_wrappers() {
   strongarm_set_conf();
-
-  // This is a workaround for the very early check of the 'site_frontpage'
-  // variable in the Drupal bootstrap process. The workaround re-runs
-  // drupal_path_initialize() to ensure the strongarm'ed version of
-  // 'site_frontpage' is used. Note that this may be too late if other modules
-  // weighted even lower than strongarm (which is a superlightweight -1000)
-  // rely on $_GET['q'] or 'site_frontpage' in hook_init().
-  $_GET['q'] = request_path();
-  drupal_path_initialize();
 }
 
 /**