Merge "Revert "Inline long shift code""