Revert "squash use address bits in export"

This reverts commit 5c2ccc7699026ed708a04ecbac71788a5c47470a.