Reverting changes to functions that have no business being used in CLI apps to begin with

Signed-off-by: Daniel Hunsaker <danhunsaker@gmail.com>