Revert abstract model formatting
Merge branch 'cm-services-mongodb' of github.com:cm-jan/CM into issue-1156