diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
index 09c950dbd91..dea118fec43 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
@@ -1876,10 +1876,10 @@ public class ScriptRuntime {
         }
     }
 
-    public static Scriptable initScript(Context cx, Scriptable scope,
-                                        NativeFunction funObj,
-                                        Scriptable thisObj,
-                                        boolean fromEvalCode)
+    public static void initScript(Context cx, final Scriptable scope,
+                                  NativeFunction funObj,
+                                  Scriptable thisObj,
+                                  boolean fromEvalCode)
     {
         String[] argNames = funObj.argNames;
         if (argNames != null) {
@@ -1908,8 +1908,6 @@ public class ScriptRuntime {
                 }
             }
         }
-
-        return scope;
     }
 
     public static Scriptable runScript(Script script) {
diff --git a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
index b0e6a821d72..b6fd5cbe3ed 100644
--- a/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
+++ b/mozilla/js/rhino/src/org/mozilla/javascript/optimizer/Codegen.java
@@ -1312,6 +1312,7 @@ class BodyCodegen
                                    +"Lorg/mozilla/javascript/Scriptable;"
                                    +"[Ljava/lang/Object;"
                                    +")Lorg/mozilla/javascript/Scriptable;");
+        	cfw.addAStore(variableObjectLocal);
             debugVariableName = "activation";
         } else {
             cfw.addALoad(contextLocal);
@@ -1325,10 +1326,9 @@ class BodyCodegen
                                    +"Lorg/mozilla/javascript/NativeFunction;"
                                    +"Lorg/mozilla/javascript/Scriptable;"
                                    +"Z"
-                                   +")Lorg/mozilla/javascript/Scriptable;");
+                                   +")V");
             debugVariableName = "global";
         }
-        cfw.addAStore(variableObjectLocal);
 
         int functionCount = scriptOrFn.getFunctionCount();
         for (int i = 0; i != functionCount; i++) {