I too had to do this in December and the war of words had escalated by that time. In early December they stopped issuing visas for Shenzhen at the border (unless you had connections). Then about 2 weeks ago the US and Chinese authorities came to an understanding and as of 15 Jan things went back to normal.