jdk

af2e2b70 - revert unrelated changes