Merge "Revert "Better support for x86 XMM registers""