diff --git a/functions-common b/functions-common
index 446de53..705c314 100644
--- a/functions-common
+++ b/functions-common
@@ -1803,8 +1803,7 @@
         # Look for top-level 'enabled' function for this service
         if type is_${service}_enabled >/dev/null 2>&1; then
             # A function exists for this service, use it
-            is_${service}_enabled
-            enabled=$?
+            is_${service}_enabled && enabled=0
         fi
 
         # TODO(dtroyer): Remove these legacy special-cases after the is_XXX_enabled()