Revert custom patch workaround for a Java 8 import handling bug

Java 11 and later have no problem with the original code, so we don't
need this patch anymore.