diff --git services.admin.inc services.admin.inc
index a05368a..8ae0982 100644
--- services.admin.inc
+++ services.admin.inc
@@ -47,7 +47,7 @@ function services_list_endpoint($js = NULL) {
     }
     $operations = array();
 
-    if ($endpoint->status) {
+    if (empty($endpoint->disabled)) {
       $operations[] = array(
         'title' => t('Edit'),
         'href'  => 'admin/config/services/services/' . $endpoint->name . '/edit',
@@ -57,7 +57,20 @@ function services_list_endpoint($js = NULL) {
         'href'  => 'admin/config/services/services/' . $endpoint->name . '/export',
       );
     }
-    if ($endpoint->status) {
+
+    if ($endpoint->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
+      $operations[] = array(
+        'title' => t('Revert'),
+        'href'  => 'admin/build/services/' . $endpoint->name . '/delete',
+      );
+    }
+    elseif ($endpoint->export_type != EXPORT_IN_CODE) {
+      $operations[] = array(
+        'title' => t('Delete'),
+        'href'  => 'admin/build/services/' . $endpoint->name . '/delete',
+      );
+    }
+    elseif (empty($endpoint->disabled)) {
       $operations[] = array(
         'title' => t('Disable'),
         'href'  => 'admin/config/services/services/' . $endpoint->name . '/disable',
@@ -71,32 +84,22 @@ function services_list_endpoint($js = NULL) {
         'query' => drupal_get_destination(),
       );
     }
-    if ($endpoint->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
-      $operations[] = array(
-        'title' => t('Revert'),
-        'href'  => 'admin/config/services/services/' . $endpoint->name . '/delete',
-      );
-    }
-    elseif ($endpoint->export_type != EXPORT_IN_CODE) {
-      $operations[] = array(
-        'title' => t('Delete'),
-        'href'  => 'admin/config/services/services/' . $endpoint->name . '/delete',
-      );
-    }
     $auth_names = array();
     foreach (array_keys($endpoint->authentication) as $module) {
       $info = services_authentication_info($module);
       $auth_names[] = $info['title'];
     }
     $row_class = '';
-    if($endpoint->status) {
-      $row_class = 'services-endpoint-enabled';
+    if (empty($endpoint->disabled)) {
+      if ($endpoint->debug) {
+        $row_class = 'services-endpoint-debug';
+      }
+      else {
+        $row_class = 'services-endpoint-enabled';
+      }
     } else {
       $row_class = 'services-endpoint-disabled';
     }
-    if($endpoint->debug && $endpoint->status) {
-      $row_class = 'services-endpoint-debug';
-    }
     $auth_names = array();
     foreach (array_keys($endpoint->authentication) as $module) {
       $info = services_authentication_info($module);
@@ -435,8 +438,8 @@ function services_enable_endpoint($endpoint) {
   if (!is_object($endpoint)) {
     $endpoint = services_endpoint_load($endpoint);
   }
-  $endpoint->status = 1;
-  services_endpoint_save($endpoint);
+  ctools_include('export');
+  ctools_export_set_status('services_endpoint', $endpoint->name, FALSE);
  cache_clear_all(NULL, 'cache_menu');
   menu_rebuild();
   drupal_goto();
@@ -449,8 +452,8 @@ function services_disable_endpoint($endpoint) {
   if (!is_object($endpoint)) {
     $endpoint = services_endpoint_load($endpoint);
   }
-  $endpoint->status = 0;
-  services_endpoint_save($endpoint);
+  ctools_include('export');
+  ctools_export_set_status('services_endpoint', $endpoint->name, TRUE);
  cache_clear_all(NULL, 'cache_menu');
   menu_rebuild();
   drupal_goto();
diff --git services.install services.install
index 54ea80a..840f26e 100644
--- services.install
+++ services.install
@@ -68,13 +68,6 @@ function services_schema() {
          'not null'    => TRUE,
          'default'     => 0
       ),
-      'status' => array(
-       'description' => 'Endpoint is enabled.',
-       'type'        => 'int',
-       'length'      => 2,
-       'not null'    => TRUE,
-       'default'     => 1
-      ),
     ),
     'primary key' => array('eid'),
     'unique keys' => array(
@@ -120,4 +113,10 @@ function services_uninstall() {
 function services_update_7301() {
   db_add_field('services_endpoint', 'debug', array('type' => 'int', 'not null' => TRUE, 'default' => 0));
   db_add_field('services_endpoint', 'status', array('type' => 'int', 'not null' => TRUE, 'default' => 1));
+}
+/**
+ * Update 7302 restores the usage of Chaos tools to check for enable/disable-status
+ */
+function services_update_7302() {
+  db_drop_field('services_endpoint', 'status');
 }
\ No newline at end of file
diff --git services.module services.module
index e8d6f98..aee39b8 100644
--- services.module
+++ services.module
@@ -161,7 +161,7 @@ function services_menu() {
   );
   $endpoints = services_endpoint_load_all();
   foreach ($endpoints as $endpoint) {
-    if ($endpoint->status) {
+    if (empty($endpoint->disabled)) {
       $items[$endpoint->path] = array(
         'title'             => 'Services endpoint',
         'access callback'   => 'services_access_menu',
diff --git tests/functional/ServicesWebTestCase.php tests/functional/ServicesWebTestCase.php
index 9c24087..8677c51 100644
--- tests/functional/ServicesWebTestCase.php
+++ tests/functional/ServicesWebTestCase.php
@@ -265,7 +265,6 @@
       ),
     );
     $endpoint->debug = 1;
-    $endpoint->status = 1;
     services_endpoint_save($endpoint);
     $endpoint = services_endpoint_load($endpoint->name);
     if($endpoint->name == $edit['name']) {