KAFKA-1382 follow up patch; reviewed by Neha Narkhede