EXP-25. Fixes build with new EntityId mechanisms.

Reviewed by: daisy