Revert "Merge branch 'refactoring_2016' into 'master'"

This reverts merge request !57
12 jobs for revert-31d905b0 in 10 minutes and 36 seconds (queued for 2 seconds)