Merge branch 'revert-e86f9476' into 'master'

Revert "Merge branch 'oneclick_nn_training' into 'master'"

See merge request !33
2 jobs for master in 6 minutes and 21 seconds
Status Job ID Name Coverage
  Windows
passed #270576
Windows10
masterJobWindows

00:01:37

 
  Linux
passed #270577
masterJobLinux

00:04:43