Revert to use java 1.8 again