Wrong behaviour after "Use household address" is unchecked

This bug report is related to CRM-1917

Testcase:

1. Create fresh individual with full address
2. Create fresh household with full address
3. Go to individual editing screen, check "Use Household Address" and choose newly created household, hit Save.
4. Go to individual editing screen again, uncheck "Use Household Address", hit Save.

Effect: original individual's address disappeared, now the address is made of country and state coming from household's address.

Note 1: I would expect that original individual's address should reappear after "Use Household Address" is unchecked.
Note 2: Country and state "leftovers" might be caused by country hierselector work in progress (consult Kurund).