Steering wheel free play

[soother]

Hi Folks

I believe that the MOT limit for free play at the steering wheel rim is 13mm. My car will probably fail on this.
There is a small amount in the universal joints down to the rack, but almost all of the play is between the steering wheel and the first joint.
Is this repairable without removing/replacing the whole steering column?

I seem to remember from other cars that the shaft down from the wheel is 'D' shaped, and there is a stub with plastic inserts which fits around this in the column tube and couples the motion to the first joint. Is this how it is in a 6N2?

Thanks.