Hierarchical Select for Contact Type -> Field Allows Users to Pick Fields that do not Belong to the Selected Type

Because the fields for the contact types (Individ, Org, HH) have been merged into civicrm_contact - the segregation of contact type specific fields in the Profile "add / edit" field hierarchical select is broken. This also affects the Export >> Select Fields to Include form.

EX: You choose "Organization" as your record type - and you can still choose First Name as a field.

This is likely to cause support problems on the forums as folks mix up record types and fields - causing profiles to throw errors or not display at all when included in a contrib form, my account etc.