Revert "Merge pull request #79 from WMCAlliance/config-rewrite"

This reverts commit 2bb2381447a68e5e95e2e43928fdccf06b278de7, reversing
changes made to 9ee130c91618025536cd7a74521ac9bdc77d67d7.