Restoring original functionality, this fixes first task in #177: Implement distributed AGAS