diff --git a/av1/common/filter.c b/av1/common/filter.c
index 4d0a8bd..d352847 100644
--- a/av1/common/filter.c
+++ b/av1/common/filter.c
@@ -286,9 +286,9 @@
 
 static const InterpFilterParams av1_interp_4tap[2] = {
   { (const int16_t *)sub_pel_filters_4, SUBPEL_TAPS, SUBPEL_SHIFTS,
-    FOURTAP_REGULAR },
+    EIGHTTAP_REGULAR },
   { (const int16_t *)sub_pel_filters_4smooth, SUBPEL_TAPS, SUBPEL_SHIFTS,
-    FOURTAP_SMOOTH },
+    EIGHTTAP_SMOOTH },
 };
 #endif
 
diff --git a/av1/common/filter.h b/av1/common/filter.h
index 19caf7c..dae17c2 100644
--- a/av1/common/filter.h
+++ b/av1/common/filter.h
@@ -44,10 +44,6 @@
   FILTER_SHARP_UV,
   FILTER_SMOOTH2_UV,
 #endif  // USE_EXTRA_FILTER
-#if CONFIG_SHORT_FILTER
-  FOURTAP_REGULAR,
-  FOURTAP_SMOOTH,
-#endif
   INTERP_FILTERS_ALL,
   SWITCHABLE_FILTERS = BILINEAR,
   SWITCHABLE = SWITCHABLE_FILTERS + 1, /* the last switchable one */
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 7c45538..fa214b6 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -183,7 +183,7 @@
 set(CONFIG_REFERENCE_BUFFER 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_REF_ADAPT 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_SEGMENT_GLOBALMV 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_SHORT_FILTER 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_SHORT_FILTER 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_SIMPLE_BWD_ADAPT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_SIMPLIFY_TX_MODE 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure
index 76d9bf8..f666fd1 100755
--- a/configure
+++ b/configure
@@ -522,6 +522,7 @@
       soft_enable palette_delta_encoding
       soft_enable frame_size
       soft_enable segment_globalmv
+      soft_enable short_filter
     fi
 
     # Enable low-bitdepth pixel pipeline by default
diff --git a/test/av1_convolve_test.cc b/test/av1_convolve_test.cc
index aaef7cf..e776274 100644
--- a/test/av1_convolve_test.cc
+++ b/test/av1_convolve_test.cc
@@ -270,8 +270,15 @@
 TEST(AV1ConvolveTest, av1_highbd_convolve) {
   ACMRandom rnd(ACMRandom::DeterministicSeed());
   InterpFilters interp_filters = av1_broadcast_interp_filter(EIGHTTAP_REGULAR);
+  int w = 1;
+  int h = 1;
+#if CONFIG_SHORT_FILTER
+  InterpFilterParams filter_params =
+      av1_get_interp_filter_params_with_block_size(EIGHTTAP_REGULAR, w);
+#else
   InterpFilterParams filter_params =
       av1_get_interp_filter_params(EIGHTTAP_REGULAR);
+#endif
   int filter_size = filter_params.taps;
   int filter_center = filter_size / 2 - 1;
   uint16_t src[12 * 12];
@@ -282,8 +289,6 @@
   int y_step_q4 = 16;
   int avg = 0;
   int bd = 10;
-  int w = 1;
-  int h = 1;
 
   int subpel_x_q4;
   int subpel_y_q4;