Reinstate JDK 8