In r17184:
revert r17145 which was based on misunderstanding of the algo, and fix the inverted_circle case, refs #3577