TVB-1405
Revert refactor, as it seems to be breaking un-committed code.

git-svn-id: https://repo.thevirtualbrain.org/svn/tvb/trunk/scientific_library@6326 1c0e02f0-7929-43c0-8fb3-3293bf43b0d1
Merge branch 'trunk' of https://github.com/the-virtual-brain/tvb-library into trunk