-Fix (r25906): That simplification was a bit too much.