Reverted bug that caused switches to toggle back to on