Reverting fix for KeyError
Removing copy of KafkaConnection implementation