backport removing class level _servers variable