Revert "Fixups and changes for x86 emulation"
Merge pull request #17 from ghaststeam/revert-16-master

Revert "Fixups and changes for x86 emulation"