Revert "Merge branch 'feature/6147_format' into develop"

This reverts commit f6d2ba8cdb75acf2b4eb99aca8c283b02760fa55, reversing
changes made to e79bd4d25a6abb67478a5a8ccd2d1813f77f7d09.