Reverting use of ${JAVA_HOME} in PATH