Reverted to no-templated implementation of VoronoiDiagram