Revert "Merge branch 'algorithm_cxx_v2' into 'master'"

This reverts commit a6ab4867, reversing
changes made to 5c7900bc.

Bogus test phase.
5 jobs for algorithm_cxx_v2 in 38 minutes and 26 seconds (queued for 2 seconds)