Remove special handling for entity types named 'custom'

Related to #3571928

Merge request reports

Loading