This reverts commit cdc78058c78dfa4966758a342acd2c1f3b282c46.
It introduced several issues in the command line tools, and it's
implementing a new API that may still see some changes.
Revert for the time being until the state of the API is defined.
Signed-off-by: James Almer <jamrial@gmail.com>