Backed out of refactor for class-specific connection