Revert "Revert "Remove address spaces.""

This reverts commit 570bde595fcfce092e9d82c876b90a70d860e13a.
Revert "Revert "Revert "Remove address spaces."""

This reverts commit d7217322ec65df8c3d212db6afb84a76b3a298c4.