Revert r174152. The shift amount may overflow and in that case this transformation...