This reverts commit 2378ba63. I need to fix the x86 specific register tests.
mentioned in commit 6bf6c476