Revert " * [KAFKA-1414]"

This reverts commit c3be42f7f7157091b7bfbf7ad810e4203e61a638.
 * [KAFKA-1414] new