Revert "java 8/1"

This reverts commit 3ef53f1197abf940d6758e1da58dc1d81f00ecaf.
Revert "Revert "java 8/1""

This reverts commit 0339c4e4292db9798a47cfe768ac97333d6fd0d9.