NYC revives, expands menu-labeling plan