Revert "mods to make address extension work:"

This reverts commit 13295875abdd11a4933e879084335aaed5517224.