Apply Nate's patch for tool_config