Restore OutputCapture functionality which was removed in #39

Review by @benmccann