Urq Hi/Lo beam switch R&R?

[Felix Tang]

Has anyone repaired or replaced the high/lo beam switch on the Urq steering
column?  Bentley indicates that the switch is part of the wiper switch
assembly, which is actuated by the turn signal lever assembly.  Is the
Hi/Lo switch an integral part (non-removeable) of the wiper assembly?

Mine refuses to go into Hi-Beam mode.  As I pull back on the lever, it goes
through the 'flash to pass' position and turns on the high beams along with
the blue indicator on the instrument panel.  The high beams stay on and the
low beam shuts off as it clicks through the aft-most position.  However
upon release, the high beams and blue panel indicator go off as well
:(  Pull the lever again and the low beams come back on.

I am going to pull the steering wheel and remove the 2 switch assemblies
over the weekend.  Hoping that someone has BTDT before I inadvertently
wreck something.

Oh, and how do I remove the rotary headlight switch on the upper left of
the instrument panel?

Thanks,
- Felix
'85 Urq
'90 CQ 20vt
'01 S4
'03 allroad