jdk

c9cbb9a0 - Further simplification