--- includes/bootstrap.inc.5.10	2008-09-23 08:53:05.000000000 -0600
+++ includes/bootstrap.inc	2008-09-20 10:14:52.000000000 -0600
@@ -5,6 +5,9 @@
  * @file
  * Functions that need to be loaded on every Drupal request.
  */
+if ($_SERVER['HTTP_X_REMOTE_ADDR']) {
+    $_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_REMOTE_ADDR'];
+}
 
 /**
  * Indicates that the item should never be removed unless explicitly told to
