[misc] Reverting previous cleanup. It is included in standard JRE but it's a very old version, even in Java 8...