Merge "Revert "[optimizing] Improve x86 shifts""