Revert "Globally replace buffer-substring-filters with filter-buffer-substring-functi...