What was Mexico City's old affiliation with the nation of Mexico