Bug 21771: (follow-up) Revert the shift statement