diff -r 5b8412751305 -r fbc58b45355e jdk/make/launchers/Makefile
--- a/jdk/make/launchers/Makefile	Thu Feb 21 15:25:07 2013 -0400
+++ b/jdk/make/launchers/Makefile	Fri Feb 22 10:23:11 2013 -0400
@@ -77,12 +77,7 @@
   -J-Dsun.jvm.hotspot.debugger.useWindbgDebugger, )
 $(call make-launcher, jps, sun.tools.jps.Jps, , )
 $(call make-launcher, jrunscript, com.sun.tools.script.shell.Main, , )
-ifeq ("$(NEWBUILD)","true")
-$(call make-launcher, jjs, jdk.nashorn.tools.Shell, \
-  -J-XX:-TieredCompilation \
-  -J-Xms2G \
-  -J-Xmx2G, )
-endif
+$(call make-launcher, jjs, jdk.nashorn.tools.Shell, , )
 $(call make-launcher, jsadebugd, sun.jvm.hotspot.jdi.SADebugServer, , )
 $(call make-launcher, jstack, sun.tools.jstack.JStack, \
   -J-Dsun.jvm.hotspot.debugger.useProcDebugger \