diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java
index 767f15cb..f3b1cb6f 100644
--- a/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java
+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java
@@ -287,22 +287,11 @@ public class PerformanceManagerService extends CMSystemService {
 
         boolean isProfileSame = profile == mActiveProfile;
 
-        if (!isProfileSame) {
-            if (profile == PROFILE_POWER_SAVE) {
-                // Handle the case where toggle power saver mode failed
-                long token = Binder.clearCallingIdentity();
-                try {
-                    if (!mPm.setPowerSaveMode(true)) {
-                        return false;
-                    }
-                } finally {
-                    Binder.restoreCallingIdentity(token);
-                }
-            } else if (mActiveProfile == PROFILE_POWER_SAVE) {
-                long token = Binder.clearCallingIdentity();
-                mPm.setPowerSaveMode(false);
-                Binder.restoreCallingIdentity(token);
-            }
+        if (!isProfileSame && profile != PROFILE_POWER_SAVE &&
+                mActiveProfile == PROFILE_POWER_SAVE) {
+            long token = Binder.clearCallingIdentity();
+            mPm.setPowerSaveMode(false);
+            Binder.restoreCallingIdentity(token);
         }
 
         /**
diff --git a/cm/res/res/values/strings.xml b/cm/res/res/values/strings.xml
index 47fc6ecc..d4a6f7d3 100644
--- a/cm/res/res/values/strings.xml
+++ b/cm/res/res/values/strings.xml
@@ -109,7 +109,7 @@
     <string name="perf_profile_bias_perf">Quick</string>
 
     <!-- Performance profiles -->
-    <string name="perf_profile_pwrsv_summary">Maximum power savings. Reduces device performance, disables background tasks and data, disables animations, and reduces display frame rate</string>
+    <string name="perf_profile_pwrsv_summary">Maximum power savings, reduces device performance</string>
     <string name="perf_profile_bal_summary">Balance of optimal performance and power characteristics</string>
     <string name="perf_profile_perf_summary">High performance mode. Useful for applications requiring low latency and highest throughput when power consumption is not a concern</string>
     <string name="perf_profile_bias_power_summary">Favor power savings. Limit maximum CPU power and optimize for power saving at the cost of higher latency</string>