[DO NOT SQUASH]: revert KIP-695#10119

vvcephei wants to merge 2 commits into

apache:2.8apache/kafka:2.8from

vvcephei:kip-695-revertvvcephei/kafka:kip-695-revertCopy head branch name to clipboard