Revert "Changes to tools to be compatible with the new Infra Manager"

This reverts commit a46cc7e4d2aaab2d5a064a021a2e88b93e27672c.