Updating default organization's address/phone wipes out the contact sub-type

I have reproduced the issue in the public demo. My steps to reproduce:

• Go to: http://drupal.demo.civicrm.org/civicrm/contact/view?reset=1&cid=1

• Click "edit" and change the contact sub-type to be "Sponsor". Click "Save"

• Go to: http://drupal.demo.civicrm.org/civicrm/admin/domain?action=update&reset=1 then change anything and click "save"

• Go back and look at: http://drupal.demo.civicrm.org/civicrm/contact/view?reset=1&cid=1
  The contact no longer has the "Sponsor" sub-type. (This happens with any contact sub-type, not just "Sponsor"