[minor] Allow returning of servers