Commit73c229714was a bit of a sledgehammer for the associated problem of degenerate points. This commit replaces that one by only performing additional simplification of the zone polygons on those polygons that fail our initial triangulation attempt. (cherry picked from commit3ebba6cbe1)