Fix issues introduced by switching off exposePODMembers in data model
Fixes issues introduced by eicd!32 (merged) This is an intermediate state, and things should get cleaner while we do the actual data model overhaul from eicd!33 (closed)
Fixes issues introduced by eicd!32 (merged) This is an intermediate state, and things should get cleaner while we do the actual data model overhaul from eicd!33 (closed)