[#2350] Do not statically reference a Connection from GenerationTool