temporarily re-enabling support for [!] entity classes