Revert "Merge branch 'development' into config-rewrite"

This reverts commit 3ca6c4501fa83b6434ed71777efb066d5462eb05, reversing
changes made to d6fd8da8c246cb9681274b9d9848dd58f2f8571b.