Re #6577. Remove first attempted port to v2 API.

This algorithm was partially ported to v2 but the old version was left
in place and is picked up first. This one still needs more done to
make it work with v2 so the work will be started over under #7404.