Reverted previous commit with fluid interface EntityIdSetter