Revert "Fetch distributor, if its missing from data_dict. This modification is needed for API calls."

This reverts commit d42715e0b1927b2aae95d49113e6603746424314.