Revert "Fix intellij/jdk8 errors and warnings"

This reverts commit 6dc54a7c00a75bc85ccd6c0061217917b02fe953.