Revert "Settings: Fix switch state being out of sync."

This reverts commit 33ed236a7dd8778866ac67f8759caf88201d72e0.