Re #8569. Correctly applying a manual u-shift.