Revert "Merge branch 'feature/6702_splitting_settings' into develop"

This reverts commit 4b9662117b90bdc10278f6341bfcda55599c7f95, reversing
changes made to f13f13b449b05a2f2cc29c221e21c9fa91eee10b.