Revert "Merge remote-tracking branch 'remotes/ehabkost/tags/x86-pull-request' into...