This reverts commit fa4e714f307fce3cec4a13bd6cfbf2760134a710.
This is temporarily reverted until we have support in MenuItem to ensure
that `0` is always the default selection, even for toggles. This should
be reverted when #1433 is done (which will resolve#1434)