Could we move this to tap_filter? This is used only one, here.