How has everyone handled City walls and upgrading to a metropolis?

Especially in the case of the Chinese who start with walls.

Do you get the walls, or do you have to rebuild them?

I guess if you stay consistant with the rest of the rules where its cheaper to buy early and you get the upgrade for free, the Chinese would get the metropolis walls for free.