Revert logic for deleting model properties that interfered with signup.
Merge branch 'master' into production