The 64-bit addresses were not the problem (confirmed with analysis on x386 VM). Reverting those changes.

This reverts commit 9df018be95473547bcaf16d5d5f8fe236e25af36.