diff --git a/docs/user/FlowVariables.md b/docs/user/FlowVariables.md
index 01afb784f3..eecabade2e 100644
--- a/docs/user/FlowVariables.md
+++ b/docs/user/FlowVariables.md
@@ -246,7 +246,7 @@ configuration file.
| PWR_NETS_VOLTAGES| Used for IR Drop calculation.| |
| RCX_RULES| RC Extraction rules file path.| |
| RECOVER_POWER| Specifies how many percent of paths with positive slacks can be slowed for power savings [0-100].| 0|
-| REMOVE_ABC_BUFFERS (deprecated)| Remove abc buffers from the netlist. If timing repair in floorplanning is taking too long, use a SETUP/HOLD_SLACK_MARGIN to terminate timing repair early instead of using REMOVE_ABC_BUFFERS or set SKIP_LAST_GASP=1.| 0|
+| REMOVE_ABC_BUFFERS (deprecated)| Remove abc buffers from the netlist. If timing repair in floorplanning is taking too long, use a SETUP/HOLD_SLACK_MARGIN to terminate timing repair early instead of using REMOVE_ABC_BUFFERS or set SKIP_LAST_GASP=1. Some designs still need it to reach their QoR targets.| 0|
| REMOVE_CELLS_FOR_LEC| String patterns directly passed to write_verilog -remove_cells <> for lec checks.| |
| REPAIR_PDN_VIA_LAYER| Remove power grid vias which generate DRC violations after detailed routing.| |
| REPORT_CLOCK_SKEW| Report clock skew as part of reporting metrics, starting at CTS, before which there is no clock skew. This metric can be quite time-consuming, so it can be useful to disable.| 1|
diff --git a/flow/designs/sky130hd/aes/config.mk b/flow/designs/sky130hd/aes/config.mk
index 77fa88992e..3f095cd981 100644
--- a/flow/designs/sky130hd/aes/config.mk
+++ b/flow/designs/sky130hd/aes/config.mk
@@ -16,8 +16,6 @@ export TNS_END_PERCENT = 100
export FASTROUTE_TCL = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/fastroute.tcl
-export REMOVE_ABC_BUFFERS = 1
-
export CTS_CLUSTER_SIZE = 20
export CTS_CLUSTER_DIAMETER = 50
diff --git a/flow/designs/sky130hd/jpeg/config.mk b/flow/designs/sky130hd/jpeg/config.mk
index 02964073ba..3b86ccc548 100644
--- a/flow/designs/sky130hd/jpeg/config.mk
+++ b/flow/designs/sky130hd/jpeg/config.mk
@@ -11,6 +11,3 @@ export PLACE_DENSITY_LB_ADDON = 0.15
export TNS_END_PERCENT = 100
export FASTROUTE_TCL = $(DESIGN_HOME)/$(PLATFORM)/$(DESIGN_NICKNAME)/fastroute.tcl
-
-export REMOVE_ABC_BUFFERS = 1
-
diff --git a/flow/designs/sky130hs/aes/config.mk b/flow/designs/sky130hs/aes/config.mk
index 74768ee451..bfc9d256a2 100644
--- a/flow/designs/sky130hs/aes/config.mk
+++ b/flow/designs/sky130hs/aes/config.mk
@@ -12,8 +12,6 @@ export CORE_MARGIN = 2
export PLACE_DENSITY_LB_ADDON = 0.25
export TNS_END_PERCENT = 100
-export REMOVE_ABC_BUFFERS = 1
-
export CTS_CLUSTER_SIZE = 10
export CTS_CLUSTER_DIAMETER = 50
diff --git a/flow/scripts/variables.json b/flow/scripts/variables.json
index 1e3d6d01ab..36bf7a3329 100644
--- a/flow/scripts/variables.json
+++ b/flow/scripts/variables.json
@@ -941,7 +941,7 @@
"REMOVE_ABC_BUFFERS": {
"default": 0,
"deprecated": 1,
- "description": "Remove abc buffers from the netlist. If timing repair in floorplanning is taking too long, use a SETUP/HOLD_SLACK_MARGIN to terminate timing repair early instead of using REMOVE_ABC_BUFFERS or set SKIP_LAST_GASP=1.\n",
+ "description": "Remove abc buffers from the netlist. If timing repair in floorplanning is taking too long, use a SETUP/HOLD_SLACK_MARGIN to terminate timing repair early instead of using REMOVE_ABC_BUFFERS or set SKIP_LAST_GASP=1. Some designs still need it to reach their QoR targets.\n",
"stages": [
"floorplan"
]
diff --git a/flow/scripts/variables.yaml b/flow/scripts/variables.yaml
index 3c48319451..8301d50fd8 100644
--- a/flow/scripts/variables.yaml
+++ b/flow/scripts/variables.yaml
@@ -512,6 +512,7 @@ REMOVE_ABC_BUFFERS:
Remove abc buffers from the netlist. If timing repair in floorplanning is
taking too long, use a SETUP/HOLD_SLACK_MARGIN to terminate timing repair early
instead of using REMOVE_ABC_BUFFERS or set SKIP_LAST_GASP=1.
+ Some designs still need it to reach their QoR targets.
stages:
- floorplan
deprecated: 1