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)
Status Job ID Name Coverage
  Build
passed #150769
docker
build_linux_36

00:05:51

58.0%
passed #150767
macosx
build_macosx_36

00:06:36

58.0%
canceled #150766
docker
build_linux_36

00:06:40

 
  Docker
passed #150773
docker-build
docker_linux_36

00:25:59

72.0%
canceled #150768
docker-build
docker_linux_36