I just did changeset 169297918 reverting this, as well as tuesdayyadseut's similar changesets 164998419/164958009/164949377, and your partial repair changeset 165076605 MxxCon. I tried to revert just the messed up building shapes and keep the address updates, but it was too much trouble. But all geocoders I know work fine in Brooklyn without the city and state tags, so no terrible loss.