Revision 2999

Undoing the last changes in rel-2-1-patches .  I want to only commit them
to HEAD until they have been tested further.

The radio buttons behave properly, but I'm not sure they trigger the
right behavior in the