Undo the HBase optimization #30

Fix #30