Removed generic address resolution until a sane scheme can be found.