Merge branch 'revert-22ded188' into 'master'

Revert "Merge branch 'new-conda-build' into 'master'"

See merge request !69
6 jobs for master in 9 minutes and 44 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #168897
docker
build_linux_36

00:03:44

passed #168898
docker
build_linux_37

00:03:42

passed #168899
macosx
build_macosx_36

00:03:52

passed #168902
macosx
build_macosx_37

00:03:45

failed #168900
macosx
build_macosx_37

00:00:02

 
  Deploy
passed #168901
docker
deploy_beta

00:02:07