Revert 'get all addresses' change for now