HOTFIX: Re-enable legacy config support, uncomment commented out configs. Needs more work.