remove address munging.

This causes more problems than it solves, and will be done in a better
way in follow-on patches.