Back out Polygon changes

Use a custom helper object instead.