New additions to parse the output stream
Revert "New additions to parse the output stream"

This reverts commit 0f43656c54f05ed407ca60302f69c4efd050f682.