Revert "Fixing tbg_cli"

This reverts commit d0e27251d8cfb798771cb21cdfb6943140787d13.