Issue #1986888 by tim.plunkett, agentrickard: Fixed Field UI integration for entity types is brittle.