Empty location data fails validation if # of locations > 1 and location type names changed

Confirmed in the demo as well as my own copy of CiviCRM 2.0.1. May be related to this issue: http://issues.civicrm.org/jira/browse/CRM-2655

Behavior:
User cannot create a new contact because validation fails with the error: "Please correct the following errors in the form fields below: Two locations cannot have same location type." I've tested this by trying to create a new organization contact, I have not yet tried individual or household.

Steps to reproduce in demo:
– Change number of locations in Global > Address Settings to 2 or more.
– Change location type names and default under Option lists > Location types. In this case, I removed the "Main" location type, re-named "Work / WORK" to "Office / OFFICE" and set "Office / OFFICE" to be the default location type.
– Try to create a new organization, adding only a value to the organization name field.

Additionally: After failing validation, I've tried to un-set the additional (unnecessary/unwanted) locations by choosing the "-select-" value from the drop-down. This also results in an error - "The Location Type should be set if there is any location information" - even though no location information is evident/apparent in that location.