Revert "Issue #3112433 by AndyF, Baysaa, Sam152, SpadXIII: Content moderation state filter incorrectly groups content type condition" This reverts commit e3371760. (cherry picked from commit cf65ed3e)