--- old/make/CreateJmods.gmk	2016-09-12 17:52:40.000000000 +0530
+++ new/make/CreateJmods.gmk	2016-09-12 17:52:40.000000000 +0530
@@ -82,14 +82,6 @@
   endif
 endif
 
-ifeq ($(MODULE), jdk.scripting.nashorn.shell)
-  JMOD_FLAGS += --main-class jdk.nashorn.tools.jjs.Main
-endif
-
-ifeq ($(MODULE), jdk.scripting.nashorn)
-  JMOD_FLAGS += --main-class jdk.nashorn.tools.Shell
-endif
-
 # Changes to the jmod tool itself should also trigger a rebuild of all jmods.
 # The variable JMOD_CMD could contain an environment variable assignment before
 # the actual command. Filter that out using wildcard before adding to DEPS.