slack-15.0: revert backport of vitessio/vitess#13856 (from #377)

slack-15.0: revert backport of vitessio/vitess#13856 (from #377) #2360