Revert "Exposing filter functions for easier overrides"

This reverts commit baa154e28be4f760f28b07881b2409666ff17872.