Revert "Handle virtual space properly"

This reverts commit 287221f9b430393a647cc888db7090ef6a103db4.