Back to single jdk build.