This reverts commit 2378ba632e5cdc761584a4154449833ac0f86384. I need to fix the x86 specific register tests.