We now create all of the edm metadata at once - including for system schema - but we should not allow that by default.