am 2b480a8c: Merge "Revert "Better support for x86 XMM registers""

* commit '2b480a8c8a1b9e515a8633bd1fa2689cdd7e42a6':
  Revert "Better support for x86 XMM registers"