My above answer is incorrect, and the correct answer is that you still need to go to China for the two-year home residency.