Revert "Rename default config to always come first"

This reverts commit 7af430d5bb368fc0d55705483c147d22aec09162.
Use the default_server designation