jdk

557ccc44 - Revert changes from other branch