Revert "Issue #2783715 by claudiu.cristea, chx, mikeryan, heddn, phenaproxima: Entity destination ID schema should match entity ID definition" This reverts commit 3348de12.