Revert "Finished Merge Emu - New Verson"

This reverts commit 56e48f7945e3212307433ff54959f735aa781eae.