TBD-890 Kafka fix for recent storm updates.