diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index f92e53b..e2a521a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -271,14 +271,18 @@
             settings.setUserAgentString(USER_AGENTS[getUserAgent()]);
         }
 
+        boolean useInverted = useInvertedRendering();
         settings.setProperty(WebViewProperties.gfxInvertedScreen,
-                useInvertedRendering() ? "true" : "false");
+                useInverted ? "true" : "false");
+        if (useInverted) {
+            settings.setProperty(WebViewProperties.gfxInvertedScreenContrast,
+                    Float.toString(getInvertedContrast()));
+        }
 
-        settings.setProperty(WebViewProperties.gfxInvertedScreenContrast,
-                Float.toString(getInvertedContrast()));
-
-        settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
-                enableCpuUploadPath() ? "true" : "false");
+        if (isDebugEnabled()) {
+            settings.setProperty(WebViewProperties.gfxEnableCpuUploadPath,
+                    enableCpuUploadPath() ? "true" : "false");
+        }
     }
 
     /**