This patch fixes another toggle bug and reverts the previous bogus
patch which caused compile warnings.

It also adds a quick comment explaining the criteria.

JE