Switched back to OpenJDK