diff --git a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
index eb5238f4fbe..d816b034fb9 100644
--- a/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
+++ b/nashorn/src/jdk/nashorn/internal/codegen/CodeGenerator.java
@@ -2423,7 +2423,7 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
         }
 
         assert undefinedSymbol != null; //remove warning
-        if (undefinedSymbol == null || !undefinedSymbol.isScope()) {
+        if (!undefinedSymbol.isScope()) {
             return false; //disallow undefined as local var or parameter
         }
 
@@ -2440,11 +2440,6 @@ final class CodeGenerator extends NodeOperatorVisitor<CodeGeneratorLexicalContex
             return false;
         }
 
-        // TODO: why?
-        if (isRestOf()) {
-            return false;
-        }
-
         //make sure that undefined has not been overridden or scoped as a local var
         //between us and global
         if (!compiler.isGlobalSymbol(lc.getCurrentFunction(), "undefined")) {