Custom fields reset when changing contact sub-type

Unsaved changes to all custom fields are lost when contact sub-type is modified.

Steps to reproduce:
Go to a contact edit screen
Enter some information in a custom field
Add or remove a contact sub-type
Your changes have been lost - moreover the fieldset has been collapsed so you don't see that your changes were lost.