diff --git a/lib/actions/documentaction.inc.php b/lib/actions/documentaction.inc.php
index ab459ae..a4bf873 100644
--- a/lib/actions/documentaction.inc.php
+++ b/lib/actions/documentaction.inc.php
@@ -13,9 +13,6 @@ class KTDocumentAction extends KTStandardDispatcher {
     var $_sShowPermission = "ktcore.permissions.read";
     var $_sDisablePermission;
 
-    var $_bDisabled;
-    var $_sDisabledText = null;
-
     var $sSection = "view_details";
     var $aBreadcrumbs = array(
         array('action' => 'browse', 'name' => 'Browse'),
@@ -46,29 +43,10 @@ class KTDocumentAction extends KTStandardDispatcher {
         if (PEAR::isError($oPermission)) {
             return true;
         }
-        return KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oDocument);
-    }
-
-    function _disable() {
-        if ($this->_bDisabled === true) {
-            return true;
-        }
         if (!KTWorkflowUtil::actionEnabledForDocument($this->oDocument, $this->sName)) {
-            $this->_sDisabledText = "Workflow does not allow this action at this time";
-            return true;
-        }
-        if (is_null($this->_sDisablePermission)) {
-            return false;
-        }
-        $oPermission =& KTPermission::getByName($this->_sDisablePermission);
-        if (PEAR::isError($oPermission)) {
             return false;
         }
-        $bResult = KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oDocument);
-        if ($bResult === false) {
-            $this->_sDisabledText = "Insufficient privileges";
-        }
-        return !$bResult;
+        return KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oDocument);
     }
 
     function getURL() {
@@ -92,11 +70,9 @@ class KTDocumentAction extends KTStandardDispatcher {
         $url = $this->getURL();
 
         $aInfo = array(
-            'disabled' => $this->_disable(),
             'description' => $this->sDescription,
             'name' => $this->sDisplayName,
             'url' => $url,
-            'disabled_text' => $this->_sDisabledText,
         );
         return $this->customiseInfo($aInfo);
     }
@@ -130,7 +106,6 @@ class KTDocumentAction extends KTStandardDispatcher {
         $this->aBreadcrumbs = array_merge($this->aBreadcrumbs,
             KTBrowseUtil::breadcrumbsForDocument($this->oDocument, $aOptions));
 
-
 	    $actions = KTDocumentActionUtil::getDocumentActionsForDocument($this->oDocument, $this->oUser);
 		$oPortlet = new KTActionPortlet(_("Document Actions"));
 		$oPortlet->setActions($actions, $this->sName);
diff --git a/lib/actions/folderaction.inc.php b/lib/actions/folderaction.inc.php
index 26ac15d..cbf7db9 100644
--- a/lib/actions/folderaction.inc.php
+++ b/lib/actions/folderaction.inc.php
@@ -14,9 +14,6 @@ class KTFolderAction extends KTStandardDispatcher {
     
     var $_bAdminAlwaysAvailable = false;
 
-    var $_bDisabled;
-    var $_sDisabledText = null;
-
     var $sSection = "browse";
     var $aBreadcrumbs = array(
         array('action' => 'browse', 'name' => 'Browse'),
@@ -59,24 +56,6 @@ class KTFolderAction extends KTStandardDispatcher {
         return KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder);
     }
 
-    function _disable() {
-        if ($this->_bDisabled === true) {
-            return true;
-        }
-        if (is_null($this->_sDisablePermission)) {
-            return false;
-        }
-        $oPermission =& KTPermission::getByName($this->_sDisablePermission);
-        if (PEAR::isError($oPermission)) {
-            return false;
-        }
-        $bResult = KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder);
-        if ($bResult === false) {
-            $this->_sDisabledText = "Insufficient privileges";
-        }
-        return !$bResult;
-    }
-
     function getURL() {
         $oKTConfig =& KTConfig::getSingleton();
         $sExt = ".php";
@@ -96,11 +75,9 @@ class KTFolderAction extends KTStandardDispatcher {
         }
 
         $aInfo = array(
-            'disabled' => $this->_disable(),
             'description' => $this->sDescription,
             'name' => $this->sDisplayName,
             'url' => $this->getURL(),
-            'disabled_text' => $this->_sDisabledText,
         );
         return $this->customiseInfo($aInfo);
     }