Reverting part of the changes because I can't make the tests pass and at the same time not show the tool usage info. Will look at it some other time.