--- a/mx/mx_truffle.py	Wed Jun 17 11:14:19 2015 +0200
+++ b/mx/mx_truffle.py	Wed Jun 17 11:17:40 2015 +0200
@@ -74,9 +74,6 @@
 """ The current working directory to switch to before running the VM. """
 _vm_cwd = None
 
-""" The base directory in which the JDKs cloned from $JAVA_HOME exist. """
-_installed_jdks = None
-
 """ Prefix for running the VM. """
 _vm_prefix = None
 
@@ -198,7 +195,6 @@
 
         rmIfExists(join(_graal_home, 'build'))
         rmIfExists(join(_graal_home, 'build-nojvmci'))
-#        rmIfExists(_jdksDir())
 
 def export(args):
     """create archives of builds split by vmbuild and vm"""
@@ -397,7 +393,7 @@
     return join(_vmLibDirInJdk(jdk), jvmCfgFile)
 
 def _jdksDir():
-    return os.path.abspath(join(_installed_jdks if _installed_jdks else _graal_home, 'jdk' + str(mx.java().version)))
+    return os.path.abspath(join(_graal_home, 'jdk' + str(mx.java().version)))
 
 def _handle_missing_VM(bld, vm=None):
     if not vm:
@@ -487,8 +483,6 @@
                 pass
     else:
         if not exists(jdk):
-            if _installed_jdks:
-                mx.log("The selected JDK directory does not (yet) exist: " + jdk)
             _handle_missing_VM(build, vmToCheck)
 
     if installJars:
@@ -867,10 +861,6 @@
     if vm is None:
         vm = _get_vm()
 
-    if _installed_jdks and _installed_jdks != _graal_home:
-        if not mx.ask_yes_no("Warning: building while --installed-jdks is set (" + _installed_jdks + ") is not recommanded - are you sure you want to continue", 'n'):
-            mx.abort(1)
-
 def vmg(args):
     """run the debug build of VM selected by the '--vm' option"""
     return vm(args, vmbuild='debug')
@@ -2232,9 +2222,6 @@
     }
 
     mx.add_argument('--vmcwd', dest='vm_cwd', help='current directory will be changed to <path> before the VM is executed', default=None, metavar='<path>')
-    mx.add_argument('--installed-jdks', help='the base directory in which the JDKs cloned from $JAVA_HOME exist. ' +
-                    'The VM selected by --vm and --vmbuild options is under this directory (i.e., ' +
-                    join('<path>', '<jdk-version>', '<vmbuild>', 'jre', 'lib', '<vm>', mx.add_lib_prefix(mx.add_lib_suffix('jvm'))) + ')', default=None, metavar='<path>')
 
     if _vmSourcesAvailable:
         mx.add_argument('--vm', action='store', dest='vm', choices=_vmChoices.keys(), help='the VM type to build/run')
@@ -2269,8 +2256,6 @@
         _make_eclipse_launch = getattr(opts, 'make_eclipse_launch', False)
     global _vm_cwd
     _vm_cwd = opts.vm_cwd
-    global _installed_jdks
-    _installed_jdks = opts.installed_jdks
     global _vm_prefix
     _vm_prefix = opts.vm_prefix