Revert "Tweaking builtin filters to be friendlier if null values passed in"

This reverts commit e786109befa96ad37fe2454c894d80c9f18d509f.