Revert "abstracted out TreeReader common stuff to TreeBuilder"

This reverts commit 7145fba0acac946c7c9ca02ac4ff088ccd3435a6.