Revert "Fix db_filter_fields opts recurcion bug with fields param."

This reverts commit 3b9edecb44998ec1388d5589b58364ab7d5f850c.