From a2441ca84c4b66bb66639c6ccf33599efe2890b3 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Thu, 4 Aug 2016 14:09:12 -0700
Subject: [PATCH] back out some uneeded chagnes

---
 libraries/shared/src/SettingHandle.cpp | 6 +-----
 libraries/shared/src/SettingManager.h  | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/libraries/shared/src/SettingHandle.cpp b/libraries/shared/src/SettingHandle.cpp
index 71427d1554..13f9ea48ce 100644
--- a/libraries/shared/src/SettingHandle.cpp
+++ b/libraries/shared/src/SettingHandle.cpp
@@ -89,11 +89,7 @@ void Settings::setValue(const QString& name, const QVariant& value) {
 }
 
 QVariant Settings::value(const QString& name, const QVariant& defaultValue) const {
-    QVariant result = _manager->value(name, defaultValue);
-    if (result == _manager->unsetValue()) {
-        return defaultValue;
-    }
-    return result;
+    return _manager->value(name, defaultValue);
 }
 
 
diff --git a/libraries/shared/src/SettingManager.h b/libraries/shared/src/SettingManager.h
index e785c5f147..ffdd4ba42a 100644
--- a/libraries/shared/src/SettingManager.h
+++ b/libraries/shared/src/SettingManager.h
@@ -28,7 +28,6 @@ namespace Setting {
 
     public:
         void customDeleter() override;
-        const QVariant& unsetValue() { return UNSET_VALUE; }
 
     protected:
         ~Manager();