reverting accidental ahead-of-schedule changes to the polygon error handling logic.