I have some questions about new Visa regulations China has imposed on US citizens because of the swine flu situation.

I have been in China for the past 6 months (have not been in the US or elsewhere aside from Hong Kong). I will be going to Thailand for two weeks and will come back to China for a few days before flying to Europe. I see the Chinese consulate has removed express Visa services for US citizens, does this apply to every US citizen or is it only for when applying from the United States? My questions is, can I get an express Visa in Bangkok or will I have to wait the 6 day period as though I was applying in the US? I ask because I need to know how much time to allot to being in Bangkok in order to get the Visa.

I know it is complicated but nobody seems to have this answer for me!

Thanks, Nat