Reverting KAFKA-1637 on 0.8.2 since it was only reverted on trunk