EST-467: reverting the changes that moved entities to dom-geography and dom-instance.