From b6bbc3e6a8ec79bd5542436e2b99ab6f0c81521b Mon Sep 17 00:00:00 2001
From: Arvindsrinivasan Lakshmi Narasimhan
 <55814491+arlakshm@users.noreply.github.com>
Date: Wed, 11 Jan 2023 11:10:52 -0800
Subject: [PATCH] Revert "[voq][chassis]Add show fabric counters port/queue
 commands (#2522)" (#2611)

This reverts commit beaac71a5937e3e4de0a476a9e99f950c3707a4b.
Reverts https://github.com/sonic-net/sonic-swss/pull/2522

Fixes https://github.com/sonic-net/sonic-buildimage/issues/13324
---
 orchagent/main.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/orchagent/main.cpp b/orchagent/main.cpp
index 69eef0a8e9dc..8d204dbf2d52 100644
--- a/orchagent/main.cpp
+++ b/orchagent/main.cpp
@@ -708,8 +708,9 @@ int main(int argc, char **argv)
         if (gMySwitchType == "voq")
         {
             orchDaemon->setFabricEnabled(true);
-            orchDaemon->setFabricPortStatEnabled(true);
-            orchDaemon->setFabricQueueStatEnabled(true);
+            // SAI doesn't fully support counters for non fabric asics
+            orchDaemon->setFabricPortStatEnabled(false);
+            orchDaemon->setFabricQueueStatEnabled(false);
         }
     }
     else