diff --git a/app/models/environment.js b/app/models/environment.js
index 1bb4c4cf1..26b54bb65 100644
--- a/app/models/environment.js
+++ b/app/models/environment.js
@@ -26,15 +26,11 @@ var Environment = Resource.extend({
     },
 
     finishUpgrade: function() {
-      this.get('finishableServices').forEach((service) => {
-        service.doAction('finishupgrade');
-      });
+      return this.doAction('finishupgrade');
     },
 
     rollback: function() {
-      this.get('rollbackableServices').forEach((service) => {
-        service.doAction('rollback');
-      });
+      return this.doAction('rollback');
     },
 
     addService: function() {
@@ -87,8 +83,8 @@ var Environment = Resource.extend({
     var a = this.get('actionLinks');
 
     var out = [
-      { label: 'Finish Upgrade',  icon: 'icon icon-success',          action: 'finishUpgrade',       enabled: this.get('finishableServices.length') > 0 },
-      { label: 'Rollback',        icon: 'icon icon-history',          action: 'rollback',            enabled: this.get('rollbackableServices.length') > 0 },
+      { label: 'Finish Upgrade',  icon: 'icon icon-success',          action: 'finishUpgrade',       enabled: !!a.finishupgrade },
+      { label: 'Rollback',        icon: 'icon icon-history',          action: 'rollback',            enabled: !!a.rollback },
       { label: 'Cancel Upgrade',  icon: 'icon icon-life-ring',        action: 'cancelUpgrade',       enabled: !!a.cancelupgrade },
       { label: 'Cancel Rollback', icon: 'icon icon-life-ring',        action: 'cancelRollback',      enabled: !!a.cancelrollback },
       { label: 'Start Services',  icon: 'icon icon-play',             action: 'activateServices',    enabled: this.get('canActivate') },
@@ -105,15 +101,7 @@ var Environment = Resource.extend({
     ];
 
     return out;
-  }.property('actionLinks.{remove,purge,exportconfig,finishupgrade,cancelupgrade,rollback,cancelrollback}','canActivate','canDeactivate','finishableServices.length','rollbackableServices.length'),
-
-  finishableServices: function() {
-    return this.get('services').filterBy('actionLinks.finishupgrade');
-  }.property('services.@each.state'),
-
-  rollbackableServices: function() {
-    return this.get('services').filterBy('actionLinks.rollback');
-  }.property('services.@each.state'),
+  }.property('actionLinks.{remove,purge,exportconfig,finishupgrade,cancelupgrade,rollback,cancelrollback}','canActivate','canDeactivate'),
 
   healthState: function() {
     // Get the state of each instance