Bug 1042135 - Revert do not track preferences to be a simple on/off swit...

...ch