Revert "Fix id generation on Mario and other x86 platforms."

This reverts commit daa7cce9131d729ddcd053eb7da7d9b98a9f7f02.