Revert "Remove address spaces."

This reverts commit 895af95b2eb82f355817f87d821a1ed8d3093670.