Revert from Java 8