Revert "Merge pull request #1240 from edx/dhm/config_separation"

pull-1240 was a breaking change merged on master since the corresponding configuration updates were not made.

This reverts commit ec01253e30a9949223df5e70ffcb4d47f8370556, reversing
changes made to ae8c9710e5a250b1acd083520f8e01b5e46dd5d0.