Revert "squash use address bits in export"

This reverts commit 09dc7b077e2d7ce86811bde3a535618f10de0a43.