                     titleText: NSLocalizedString("Use Compact Tabs", comment: "Setting to enable compact tabs in the tab overview"))
             ]
         }
+
+        settings += [
+//            SettingSection(title: nil, children: [
+//                // Without a Firefox Account:
+//                //ConnectSetting(settings: self),
+//                // With a Firefox Account:
+//                AccountStatusSetting(settings: self),
+//                SyncNowSetting(settings: self)
+//            ] + accountDebugSettings),
+            SettingSection(title: NSAttributedString(string: NSLocalizedString("General", comment: "General settings section title")), children: generalSettings)
+        ]
+
+        //var privacySettings: [Setting] = [ClearPrivateDataSetting(settings: self)]
+
+//        if #available(iOS 9, *) {
+//            privacySettings += [
+//                BoolSetting(prefs: prefs,
+//                    prefKey: "settings.closePrivateTabs",
+//                    defaultValue: false,
+//                    titleText: NSLocalizedString("Close Private Tabs", tableName: "PrivateBrowsing", comment: "Setting for closing private tabs"),
+//                    statusText: NSLocalizedString("When Leaving Private Browsing", tableName: "PrivateBrowsing", comment: "Will be displayed in Settings under 'Close Private Tabs'"))
+//            ]
+//        }
+
+//        privacySettings += [
+//            BoolSetting(prefs: prefs, prefKey: "crashreports.send.always", defaultValue: false,
+//                titleText: NSLocalizedString("Send Crash Reports", comment: "Setting to enable the sending of crash reports"),
+//                settingDidChange: { configureActiveCrashReporter($0) }),
+//            PrivacyPolicySetting()
+//        ]
+
 
         settings += [
             //SettingSection(title: NSAttributedString(string: privacyTitle), children: privacySettings),

    override var hidden: Bool { return profile.hasAccount() }
}

// For great debugging!
private class HiddenSetting: Setting {
    let settings: SettingsTableViewController


    override func viewDidLoad() {
        super.viewDidLoad()

        //let privacyTitle = NSLocalizedString("Privacy", comment: "Privacy section title")
        let accountDebugSettings: [Setting]
        if AppConstants.BuildChannel != .Aurora {
            accountDebugSettings = [
                // Debug settings:
                RequirePasswordDebugSetting(settings: self),
                RequireUpgradeDebugSetting(settings: self),
                ForgetSyncAuthStateDebugSetting(settings: self),
            ]
        } else {
            accountDebugSettings = []
        }

        let prefs = profile.prefs
        var generalSettings = [
