Revert "Fix issue when using API and email fields."

This reverts commit 0235a97d28b17b24ff8942cd751be92542ec14e1.
Fix email API field upload.

Default non-required fields to sane values. This now allows users to use
the API to upload an email as fields. Any fields which are sent which are
not supported by the class will be put into unsupported_attrs.

Strip the username and API key out of the bundle before passing to
handle_email_fields() so that they are not put in unsupported_attrs.