Revert changes from PR 1030

With streaming output of the build
changes in 1030 are no longer required.